diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46f26464..ac30a1f8 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd6162c3..ed739d4f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -177,7 +177,7 @@ jobs: - name: Setup Go uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0 with: - go-version: '1.23.6' + go-version: '1.27.4' - name: Install sha256sum run: brew install coreutils 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"]