From 19397181632262c1ddc7a85acfdd7379b400cef3 Mon Sep 17 00:00:00 2001 From: Tim Morgan Date: Sun, 15 Nov 2026 17:57:48 -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 ios-ci.yml matrices (iOS builds and iPhone and iPad UI tests), the documentation build, and SwiftLint run on the macOS 26 pool through the route outputs matching their hosted labels (xcode-27 and macos-latest). Xcode 27.2 there builds and documents the macOS 27 deployment target, and Homebrew is available for xcbeautify and swiftlint. The release workflow passes the routed xcode-27 runner to XCUITestKit ios-release.yml 1.3.0, which needs Homebrew. XCUITestKit callers moved from 1.2.1 to 1.3.0 so they accept the routed runner. Publish Nav Data Store builds and then runs DownloadNASR for macOS 27, which needs the macOS 27 OS, so it runs on the macOS 27 pool through the macos-27 route output. That pool has Homebrew, xcbeautify, gh and python3. Periphery stays on the hosted xcode-27 label: it disables Spotlight indexing with sudo, which Minerva does not allow beyond xcode-select. The route jobs are granted only contents: read. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci.yml | 18 ++++++++++++------ .github/workflows/lint.yml | 7 ++++++- .github/workflows/periphery.yml | 1 + .github/workflows/publish-nav-data-store.yml | 8 +++++++- .github/workflows/release.yml | 9 +++++++-- 5 files changed, 33 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ebec7c..c3d6984 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,13 @@ concurrency: # The runner label tracks the Xcode major version, not the OS: GitHub moved the Xcode 27 image from # macOS 26 to macOS 27 under this same label. Nothing here should be pinned to an OS assumption. jobs: + route: + uses: RISCfuture/ci-workflows/.github/workflows/minerva-route.yml@1.1.0 + permissions: + contents: read ci: - uses: RISCfuture/XCUITestKit/.github/workflows/ios-ci.yml@1.2.1 + needs: route + uses: RISCfuture/XCUITestKit/.github/workflows/ios-ci.yml@1.3.0 with: scheme: "SF50 TOLD" unit-test-plan: "SF50 Shared Unit Tests" @@ -24,13 +29,13 @@ jobs: test-execution-time-allowance: 900 build-matrix: | {"include":[ - {"ios-label":"latest","runner":"xcode-27","device":"iPhone 17 Pro","device-type":"com.apple.CoreSimulator.SimDeviceType.iPhone-17-Pro","os-version":"","xcode-version":"latest-stable"} + {"ios-label":"latest","runner":${{ needs.route.outputs.xcode-27 }},"device":"iPhone 17 Pro","device-type":"com.apple.CoreSimulator.SimDeviceType.iPhone-17-Pro","os-version":"","xcode-version":"latest-stable"} ]} ui-matrix: | {"include":[ - {"ios-label":"latest","runner":"xcode-27","device":"iPhone 17 Pro","device-type":"com.apple.CoreSimulator.SimDeviceType.iPhone-17-Pro","os-version":"","xcode-version":"latest-stable"}, - {"ios-label":"latest","runner":"xcode-27","device":"iPad Pro 13-inch (M5)","device-type":"com.apple.CoreSimulator.SimDeviceType.iPad-Pro-13-inch-M5-12GB","os-version":"","xcode-version":"latest-stable"}, - {"ios-label":"latest","runner":"xcode-27","device":"iPhone Duo","device-type":"com.apple.CoreSimulator.SimDeviceType.iPhone-Duo","os-version":"","xcode-version":"latest-stable"} + {"ios-label":"latest","runner":${{ needs.route.outputs.xcode-27 }},"device":"iPhone 17 Pro","device-type":"com.apple.CoreSimulator.SimDeviceType.iPhone-17-Pro","os-version":"","xcode-version":"latest-stable"}, + {"ios-label":"latest","runner":${{ needs.route.outputs.xcode-27 }},"device":"iPad Pro 13-inch (M5)","device-type":"com.apple.CoreSimulator.SimDeviceType.iPad-Pro-13-inch-M5-12GB","os-version":"","xcode-version":"latest-stable"}, + {"ios-label":"latest","runner":${{ needs.route.outputs.xcode-27 }},"device":"iPhone Duo","device-type":"com.apple.CoreSimulator.SimDeviceType.iPhone-Duo","os-version":"","xcode-version":"latest-stable"} ]} secret-file-path: "SF50 TOLD/NOTAM/NOTAMAPIConfig.xcconfig" secret-file-template: | @@ -42,7 +47,8 @@ jobs: docs: name: Build Documentation - runs-on: xcode-27 + needs: route + runs-on: ${{ fromJSON(needs.route.outputs.xcode-27) }} steps: - uses: actions/checkout@v7.0.1 - name: Generate NOTAM API config diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index aa655ed..5319117 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,9 +11,14 @@ concurrency: cancel-in-progress: true jobs: + route: + uses: RISCfuture/ci-workflows/.github/workflows/minerva-route.yml@1.1.0 + permissions: + contents: read swiftlint: name: Run SwiftLint - runs-on: macos-latest + needs: route + runs-on: ${{ fromJSON(needs.route.outputs.macos-latest) }} steps: - uses: actions/checkout@v7.0.1 - uses: SwiftyLab/setup-swift@v1.14.2 diff --git a/.github/workflows/periphery.yml b/.github/workflows/periphery.yml index fec52bb..ddefcc4 100644 --- a/.github/workflows/periphery.yml +++ b/.github/workflows/periphery.yml @@ -13,6 +13,7 @@ concurrency: jobs: periphery: name: Run Periphery + # Spotlight indexing is disabled with sudo, which Minerva does not allow. runs-on: xcode-27 if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository permissions: diff --git a/.github/workflows/publish-nav-data-store.yml b/.github/workflows/publish-nav-data-store.yml index 7e51f08..4ee9e39 100644 --- a/.github/workflows/publish-nav-data-store.yml +++ b/.github/workflows/publish-nav-data-store.yml @@ -31,9 +31,15 @@ permissions: contents: read jobs: + route: + uses: RISCfuture/ci-workflows/.github/workflows/minerva-route.yml@1.1.0 + permissions: + contents: read + publish: name: Build and publish the store - runs-on: xcode-27 + needs: route + runs-on: ${{ fromJSON(needs.route.outputs.macos-27) }} steps: - uses: actions/checkout@v7.0.1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8b347b4..cde047e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,12 +28,17 @@ concurrency: cancel-in-progress: false jobs: + route: + uses: RISCfuture/ci-workflows/.github/workflows/minerva-route.yml@1.1.0 + permissions: + contents: read release: - uses: RISCfuture/XCUITestKit/.github/workflows/ios-release.yml@1.2.1 + needs: route + uses: RISCfuture/XCUITestKit/.github/workflows/ios-release.yml@1.3.0 with: # Required by ios-release.yml, which deliberately defaults no runner so a runner-image # bump stays each app's own decision. - runner: xcode-27 + runner: ${{ needs.route.outputs.xcode-27 }} platforms: '["iOS"]' version: ${{ inputs.version || github.ref_name }} certificates-repo: RISCfuture/certificates