From 65aea19fe754f26ba26ed3a139d923b14c226e84 Mon Sep 17 00:00:00 2001 From: Tim Morgan Date: Sun, 15 Nov 2026 17:58:17 -0800 Subject: [PATCH] Run macOS CI on Minerva for verified commits A route job from RISCfuture/ci-workflows 1.1.0 sends macOS jobs to Minerva, the self-hosted runner, only for verified commits from RISCfuture. Every other run keeps the hosted labels. The package targets macOS 26, so no job executes a macOS 27 product and nothing uses the macos-27 output. The Swift 6.4 test leg, the documentation build in CI, the documentation deploy build, and Periphery all run on the macOS 26 pool through the macos-26 output, which also provides Homebrew for the Periphery install. The Swift 6.2 macOS test leg stays on its hosted label because setup-swift needs sudo for that toolchain and Minerva allows sudo only for xcode-select. The Linux legs, SwiftLint, swift-format, release, and dof-cycle-watch jobs are unchanged. Cache keys keep their logical labels. In the documentation deploy workflow, pages: write and id-token: write move from the workflow level to the deploy job. The build job gets contents: read, which is all upload-pages-artifact needs. No XCUITestKit workflows are used by this repository. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci.yml | 11 +++++++++-- .github/workflows/doc.yml | 14 +++++++++++--- .github/workflows/periphery.yml | 7 ++++++- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f46b934..4dd350e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,10 @@ concurrency: cancel-in-progress: true jobs: + route: + uses: RISCfuture/ci-workflows/.github/workflows/minerva-route.yml@1.1.0 + permissions: + contents: read tests: name: Build and Test strategy: @@ -38,7 +42,9 @@ jobs: swift: "6.3" - os: ubuntu-latest swift: "6.4" - runs-on: ${{ matrix.os }} + needs: route + # setup-swift needs sudo for Swift 6.2, so that leg stays hosted. + runs-on: ${{ (matrix.os == 'macos-26' || matrix.os == 'macos-latest') && matrix.swift == '6.4' && fromJSON(needs.route.outputs[matrix.os]) || matrix.os }} steps: - uses: actions/checkout@v7.0.1 - uses: SwiftyLab/setup-swift@v1.14.2 @@ -58,7 +64,8 @@ jobs: run: swift test -v docs: name: Build Documentation - runs-on: macos-26 + needs: route + runs-on: ${{ fromJSON(needs.route.outputs.macos-26) }} steps: - uses: actions/checkout@v7.0.1 - uses: SwiftyLab/setup-swift@v1.14.2 diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 0b0dcb3..f476821 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -7,17 +7,22 @@ on: permissions: contents: read - pages: write - id-token: write concurrency: group: pages cancel-in-progress: true jobs: + route: + uses: RISCfuture/ci-workflows/.github/workflows/minerva-route.yml@1.1.0 + permissions: + contents: read build: name: Generate Documentation - runs-on: macos-26 + needs: route + runs-on: ${{ fromJSON(needs.route.outputs.macos-26) }} + permissions: + contents: read steps: - uses: actions/checkout@v7.0.1 - uses: SwiftyLab/setup-swift@v1.14.2 @@ -68,6 +73,9 @@ jobs: url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest needs: build + permissions: + pages: write + id-token: write steps: - name: Deploy to GitHub Pages id: deployment diff --git a/.github/workflows/periphery.yml b/.github/workflows/periphery.yml index 3e94661..cb26024 100644 --- a/.github/workflows/periphery.yml +++ b/.github/workflows/periphery.yml @@ -4,8 +4,13 @@ on: branches: [main] pull_request: jobs: + route: + uses: RISCfuture/ci-workflows/.github/workflows/minerva-route.yml@1.1.0 + permissions: + contents: read periphery: - runs-on: macos-26 + needs: route + runs-on: ${{ fromJSON(needs.route.outputs.macos-26) }} if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository permissions: contents: read