From 95337b05b89721ae00a54b5eb33e2352ebae92e2 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Thu, 19 Nov 2026 22:03:42 +0000 Subject: [PATCH 1/2] build: update the Go toolchain Build and release with Go 1.27.4, and test on Go 1.26.11 and 1.27.4. Use Alpine 3.24 for the images, set the minimum macOS version to 13.0 and remove the windows/arm target, which Go no longer provides. Signed-off-by: Jon Ayers --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/release.yml | 2 +- images/sidecar/linux/Dockerfile | 4 ++-- scripts/build.go | 7 +++---- scripts/ci/build.sh | 5 ----- scripts/ci/docker/linux/Dockerfile | 2 +- 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59af60eb..c6c12854 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.23.6' + go-version: '1.27.4' - name: "Install sha256sum" run: brew install coreutils - run: scripts/ci/setup_go.sh @@ -55,7 +55,7 @@ jobs: timeout-minutes: 30 strategy: matrix: - goversion: ['1.22.12', '1.23.6'] + goversion: ['1.26.11', '1.27.4'] steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 @@ -76,7 +76,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.23.6' + go-version: '1.27.4' - run: scripts/ci/setup_go.sh shell: bash - run: scripts/ci/setup_docker.sh @@ -110,7 +110,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.23.6' + go-version: '1.27.4' - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - uses: docker/login-action@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a5bc7a90..45f3bbce 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,7 +50,7 @@ jobs: fi - uses: actions/setup-go@v5 with: - go-version: '1.23.6' + go-version: '1.27.4' - name: "Install sha256sum" run: brew install coreutils - run: scripts/ci/setup_go.sh diff --git a/images/sidecar/linux/Dockerfile b/images/sidecar/linux/Dockerfile index 5158cf27..ba64146b 100644 --- a/images/sidecar/linux/Dockerfile +++ b/images/sidecar/linux/Dockerfile @@ -1,5 +1,5 @@ # Use an Alpine-based Go builder. -FROM golang:1.23.6-alpine3.21 AS builder +FROM golang:1.27.4-alpine3.24 AS builder # Disable cgo in order to match the behavior of our release binaries (and to # avoid the need for gcc on certain architectures). @@ -21,7 +21,7 @@ RUN ["go", "build", "-o", "mutagen-agent-sspl", "-tags", "mutagenagent,mutagenss # Switch to a vanilla Alpine base for the final image. -FROM alpine:3.21 AS base +FROM alpine:3.24 AS base # Copy the sidecar entry point from the builder. COPY --from=builder ["/mutagen/mutagen-sidecar", "/usr/bin/mutagen-sidecar"] diff --git a/scripts/build.go b/scripts/build.go index d025379c..64e514e1 100644 --- a/scripts/build.go +++ b/scripts/build.go @@ -48,9 +48,9 @@ const ( cliBaseName = "mutagen" // minimumMacOSVersion is the minimum version of macOS that we'll support - // (currently pinned to the oldest version of macOS that Mutagen's minimum - // Go version supports). - minimumMacOSVersion = "10.15" + // (currently pinned to the oldest version of macOS that the Go version used + // for release builds supports). + minimumMacOSVersion = "13.0" // minimumARMSupport is the value to pass to the GOARM environment variable // when building binaries. We currently specify support for ARMv5. This will @@ -334,7 +334,6 @@ var targets = []Target{ // Define Windows targets. {"windows", "386"}, {"windows", "amd64"}, - {"windows", "arm"}, {"windows", "arm64"}, } diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index 564c1332..04541139 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -25,11 +25,6 @@ if [[ "${MUTAGEN_OS_NAME}" == "darwin" ]]; then zip "build/release/mutagen_windows_amd64_v${MUTAGEN_VERSION}.zip" mutagen.exe mutagen-agents.tar.gz rm mutagen.exe mutagen-agents.tar.gz - # Convert the windows/arm bundle to zip format. - tar xzf "build/release/mutagen_windows_arm_v${MUTAGEN_VERSION}.tar.gz" - zip "build/release/mutagen_windows_arm_v${MUTAGEN_VERSION}.zip" mutagen.exe mutagen-agents.tar.gz - rm mutagen.exe mutagen-agents.tar.gz - # Convert the windows/arm64 bundle to zip format. tar xzf "build/release/mutagen_windows_arm64_v${MUTAGEN_VERSION}.tar.gz" zip "build/release/mutagen_windows_arm64_v${MUTAGEN_VERSION}.zip" mutagen.exe mutagen-agents.tar.gz diff --git a/scripts/ci/docker/linux/Dockerfile b/scripts/ci/docker/linux/Dockerfile index 31979700..612ebefc 100644 --- a/scripts/ci/docker/linux/Dockerfile +++ b/scripts/ci/docker/linux/Dockerfile @@ -1,5 +1,5 @@ # Set the base image. -FROM alpine:3.21 +FROM alpine:3.24 # Add the HTTP demo server. COPY ["httpdemo", "/httpdemo"] From f0353b1a116098fe1476fe7ff5e32d7bb1a9d726 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Thu, 19 Nov 2026 22:44:14 +0000 Subject: [PATCH 2/2] ci: leave the sidecar job's Go version unchanged Signed-off-by: Jon Ayers --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf88a2b5..ac30a1f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.27.4' + go-version: '1.23.6' - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - uses: docker/login-action@v3