From 9fdea7dbcdfebbc1b295b8ec56253735763c7df0 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Thu, 19 Nov 2026 22:18:38 +0000 Subject: [PATCH 1/2] ci: remove unused jobs and update the macOS runner Signed-off-by: Jon Ayers --- .github/workflows/ci.yml | 78 ++------------------------------------- scripts/ci/sidecar_tag.go | 12 ------ 2 files changed, 3 insertions(+), 87 deletions(-) delete mode 100644 scripts/ci/sidecar_tag.go diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46f264648..7c4fc9020 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: scripts/ci/verify_commits.sh macos: name: macOS - runs-on: macos-15 + runs-on: ${{ github.repository_owner == 'coder' && 'depot-macos-26' || 'macos-26'}} timeout-minutes: 90 steps: - uses: actions/checkout@v4 @@ -44,11 +44,6 @@ jobs: - run: scripts/ci/test.sh - run: scripts/ci/build.sh - run: scripts/ci/sha256sum.sh - - uses: actions/upload-artifact@v4 - with: - name: bundles - path: build/release/* - retention-days: 2 linux: name: Linux runs-on: ubuntu-latest @@ -101,75 +96,11 @@ jobs: shell: bash - run: scripts/ci/build.sh shell: bash - sidecar: - name: Sidecar - runs-on: ubuntu-latest - needs: [macos, linux, windows] - timeout-minutes: 30 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: '1.23.6' - - uses: docker/setup-qemu-action@v3 - - uses: docker/setup-buildx-action@v3 - - uses: docker/login-action@v3 - if: github.ref_type == 'tag' && github.repository == 'mutagen-io/mutagen' - with: - username: ${{ secrets.SIDECAR_DEPLOYMENT_USER }} - password: ${{ secrets.SIDECAR_DEPLOYMENT_TOKEN }} - - name: "Determine sidecar tag" - id: tag - run: echo ::set-output name=tag::$(go run scripts/ci/sidecar_tag.go) - - uses: docker/build-push-action@v6 - with: - file: images/sidecar/linux/Dockerfile - target: mit - tags: ${{ steps.tag.outputs.tag }} - push: ${{ github.ref_type == 'tag' && github.repository == 'mutagen-io/mutagen' }} - platforms: | - linux/386 - linux/amd64 - linux/arm/v6 - linux/arm/v7 - linux/arm64/v8 - linux/ppc64le - - uses: docker/build-push-action@v6 - with: - file: images/sidecar/linux/Dockerfile - target: sspl - tags: ${{ steps.tag.outputs.tag }}-sspl - push: ${{ github.ref_type == 'tag' && github.repository == 'mutagen-io/mutagen' }} - platforms: | - linux/386 - linux/amd64 - linux/arm/v6 - linux/arm/v7 - linux/arm64/v8 - linux/ppc64le - release: - permissions: - contents: write - name: Release - runs-on: ubuntu-latest - if: github.ref_type == 'tag' - needs: [macos, linux, windows, sidecar] - timeout-minutes: 10 - steps: - - uses: actions/download-artifact@v4 - with: - name: bundles - path: bundles - - uses: alexellis/upload-assets@0.4.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - asset_paths: '["bundles/*"]' required: name: Required checks runs-on: ubuntu-latest if: always() - needs: [macos, linux, windows, sidecar] + needs: [macos, linux, windows] permissions: {} timeout-minutes: 5 steps: @@ -178,19 +109,16 @@ jobs: MACOS_RESULT: ${{ needs.macos.result }} LINUX_RESULT: ${{ needs.linux.result }} WINDOWS_RESULT: ${{ needs.windows.result }} - SIDECAR_RESULT: ${{ needs.sidecar.result }} run: | # Print the result of each job. echo "macOS: ${MACOS_RESULT}" echo "Linux: ${LINUX_RESULT}" echo "Windows: ${WINDOWS_RESULT}" - echo "Sidecar: ${SIDECAR_RESULT}" # Fail unless every job succeeded. if [[ "${MACOS_RESULT}" != "success" ]] || [[ "${LINUX_RESULT}" != "success" ]] || - [[ "${WINDOWS_RESULT}" != "success" ]] || - [[ "${SIDECAR_RESULT}" != "success" ]]; then + [[ "${WINDOWS_RESULT}" != "success" ]]; then echo "Not all jobs succeeded" 1>&2 exit 1 fi diff --git a/scripts/ci/sidecar_tag.go b/scripts/ci/sidecar_tag.go deleted file mode 100644 index 61ef659af..000000000 --- a/scripts/ci/sidecar_tag.go +++ /dev/null @@ -1,12 +0,0 @@ -package main - -import ( - "fmt" - - "github.com/mutagen-io/mutagen/pkg/mutagen" - "github.com/mutagen-io/mutagen/pkg/sidecar" -) - -func main() { - fmt.Printf("%s:%s\n", sidecar.BaseTag, mutagen.Version) -} From b40b536e8837f2d6f0667e2ae0582a840a2c79e2 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Thu, 19 Nov 2026 22:30:59 +0000 Subject: [PATCH 2/2] ci: keep the current macOS runner 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 7c4fc9020..19cb12921 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: scripts/ci/verify_commits.sh macos: name: macOS - runs-on: ${{ github.repository_owner == 'coder' && 'depot-macos-26' || 'macos-26'}} + runs-on: macos-15 timeout-minutes: 90 steps: - uses: actions/checkout@v4