From b6d05184e9bc64534862acc247afe5d64d5afaf6 Mon Sep 17 00:00:00 2001 From: Tim Morgan Date: Sun, 15 Nov 2026 17:58:25 -0800 Subject: [PATCH] Run macOS CI on Minerva for verified commits A route job from RISCfuture/ci-workflows 1.1.0 decides where macOS jobs run. It sends them to the self-hosted Minerva runner only for verified commits from RISCfuture and keeps the hosted labels for forks, other actors and unverified commits. The macOS test job executes a macOS 27 test bundle and needs no Homebrew tools, so it uses the macOS 27 pool output. The documentation build in CI, the Pages documentation build and the Periphery scan only build for macOS 27, so they use the macOS 26 pool through the xcode-27 output; Periphery needs Homebrew to install its CLI, which that pool provides. The Linux, SwiftLint, swift-format, release and NASR cycle watch jobs have no macOS runner and stay hosted. In the Pages workflow, pages: write and id-token: write move from the workflow level to the deploy job. The routed build job gets contents: read only. 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 5bd35d8..1811f08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,9 +28,15 @@ concurrency: cancel-in-progress: true jobs: + route: + uses: RISCfuture/ci-workflows/.github/workflows/minerva-route.yml@1.1.0 + permissions: + contents: read tests-darwin: name: Build and Test (macOS) - runs-on: xcode-27 + # Executes the macOS 27 test bundle, so it needs the macOS 27 pool. + needs: route + runs-on: ${{ fromJSON(needs.route.outputs.macos-27) }} steps: - uses: actions/checkout@v7.0.1 # `latest` rather than `latest-stable`: the macOS 27 SDK is what this @@ -78,7 +84,8 @@ jobs: name: Build Documentation # macOS: the CoreLocation-gated Location extension is absent from the # Linux symbol graph, so its documentation would go unchecked there. - runs-on: xcode-27 + needs: route + runs-on: ${{ fromJSON(needs.route.outputs.xcode-27) }} steps: - uses: actions/checkout@v7.0.1 - uses: maxim-lobanov/setup-xcode@v1.7.0 diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 7076570..8e0caa7 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -7,20 +7,25 @@ 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 # macOS: the CoreLocation-gated Location extension is absent from the # Linux symbol graph, so its documentation would be missing there. # xcode-27: the package's macOS 27 floor needs the macOS 27 SDK to build. - runs-on: xcode-27 + needs: route + runs-on: ${{ fromJSON(needs.route.outputs.xcode-27) }} + permissions: + contents: read steps: - uses: actions/checkout@v7.0.1 - uses: maxim-lobanov/setup-xcode@v1.7.0 @@ -71,6 +76,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 3b2d6c3..a1624e7 100644 --- a/.github/workflows/periphery.yml +++ b/.github/workflows/periphery.yml @@ -4,10 +4,15 @@ on: branches: [main] pull_request: jobs: + route: + uses: RISCfuture/ci-workflows/.github/workflows/minerva-route.yml@1.1.0 + permissions: + contents: read periphery: name: Run Periphery # xcode-27: scanning builds the package, which needs the macOS 27 SDK. - runs-on: xcode-27 + needs: route + runs-on: ${{ fromJSON(needs.route.outputs.xcode-27) }} if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository permissions: contents: read