CI: back to GitHub's runners while the self-hosted runner's environment is fixed (#1871)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
8a03355d2b
commit
dece550164
1 file changed
+8
-8
@@ -53,7 +53,7 @@ jobs:
|
||||
|
||||
changes:
|
||||
name: Select checks
|
||||
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'self-hosted-fast' }}
|
||||
runs-on: ubuntu-24.04
|
||||
outputs:
|
||||
native: ${{ steps.paths.outputs.native }}
|
||||
kernel: ${{ steps.paths.outputs.kernel }}
|
||||
@@ -105,7 +105,7 @@ jobs:
|
||||
|
||||
checks:
|
||||
name: Format and repository checks
|
||||
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'self-hosted-fast' }}
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
@@ -136,7 +136,7 @@ jobs:
|
||||
if: needs.changes.outputs.native == 'true'
|
||||
# Main and merge-queue runs use the self-hosted runner (warm build cache); pull requests
|
||||
# stay on GitHub's runners, and the runner itself refuses pull-request jobs.
|
||||
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'self-hosted-fast' }}
|
||||
runs-on: ubuntu-24.04
|
||||
env:
|
||||
# Outside the checkout, so `git clean` keeps the warm build between runs.
|
||||
CARGO_TARGET_DIR: ${{ github.event_name == 'pull_request' && 'target' || '/home/ci-runner/cargo-target/clippy' }}
|
||||
@@ -165,7 +165,7 @@ jobs:
|
||||
if: needs.changes.outputs.native == 'true'
|
||||
# Main and merge-queue runs use the self-hosted runner (warm build cache); pull requests
|
||||
# stay on GitHub's runners, and the runner itself refuses pull-request jobs.
|
||||
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'self-hosted-fast' }}
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 45
|
||||
env:
|
||||
# Outside the checkout, so `git clean` keeps the warm build between runs.
|
||||
@@ -209,7 +209,7 @@ jobs:
|
||||
tests:
|
||||
name: Native Linux tests (${{ matrix.shard }}/4)
|
||||
needs: [changes, build-tests]
|
||||
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'self-hosted-fast' }}
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 60
|
||||
strategy:
|
||||
fail-fast: false
|
||||
@@ -367,7 +367,7 @@ jobs:
|
||||
if: needs.changes.outputs.native == 'true'
|
||||
# Main and merge-queue runs use the self-hosted runner (warm build cache); pull requests
|
||||
# stay on GitHub's runners, and the runner itself refuses pull-request jobs.
|
||||
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'self-hosted-fast' }}
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 45
|
||||
env:
|
||||
# Outside the checkout, so `git clean` keeps the warm build between runs.
|
||||
@@ -393,7 +393,7 @@ jobs:
|
||||
name: Reference tests
|
||||
needs: changes
|
||||
if: needs.changes.outputs.native == 'true'
|
||||
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'self-hosted-fast' }}
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 60
|
||||
env:
|
||||
CARGO_INCREMENTAL: "0"
|
||||
@@ -480,7 +480,7 @@ jobs:
|
||||
ci:
|
||||
needs: [changes, checks, clippy, build-tests, tests, doc-tests, oracle, windows-fxc, windows-startup]
|
||||
if: always()
|
||||
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'self-hosted-fast' }}
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- name: Verify required checks
|
||||
env:
|
||||
|
||||
Reference in new issue
Block a user