diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc143a0..5da4210 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,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: @@ -46,7 +50,11 @@ jobs: swift: "6.3" - os: ubuntu-26.04 swift: "6.4" - runs-on: ${{ matrix.os }} + needs: route + # setup-swift needs sudo for Swift versions other than 6.4, so those legs stay 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 @@ -66,7 +74,8 @@ jobs: run: swift test -v documentation: name: Build Documentation - 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/doc.yml b/.github/workflows/doc.yml index f447831..2a91c48 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-latest + needs: route + runs-on: ${{ fromJSON(needs.route.outputs.macos-latest) }} + permissions: + contents: read steps: - uses: actions/checkout@v7.0.1 - uses: SwiftyLab/setup-swift@v1.14.2 @@ -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 42a3a43..9246c93 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-latest + needs: route + runs-on: ${{ fromJSON(needs.route.outputs.macos-latest) }} if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository permissions: contents: read