From b75eb896d7063a68bbcbf3551674b9b841c3e301 Mon Sep 17 00:00:00 2001 From: Lindsay Holmwood Date: Thu, 29 Oct 2026 20:42:18 +1100 Subject: [PATCH] ci(runners): measure three jobs on GitHub-hosted runners (do not merge) This is a measurement, not a change to keep. It runs Miri, tests-rust and the Linux FFI release builds on GitHub's `ubuntu-24.04` runner. The runner trial in #1297 did not time these jobs there. A job that takes more than twice as long on GitHub's runner as on Blacksmith 4 vCPU needs a bigger machine. The times from this branch decide which runner each job uses. The FFI builds take their Linux runner from `runnerFor` in `scripts/ffi-release-matrix.mjs`. So that function changes too, and the test that pins its answer fails on this branch. --- .github/workflows/_build-ffi-artifacts.yml | 2 +- .github/workflows/miri.yml | 2 +- .github/workflows/tests-rust.yml | 2 +- scripts/ffi-release-matrix.mjs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/_build-ffi-artifacts.yml b/.github/workflows/_build-ffi-artifacts.yml index 14b454141..c69d4bf51 100644 --- a/.github/workflows/_build-ffi-artifacts.yml +++ b/.github/workflows/_build-ffi-artifacts.yml @@ -358,7 +358,7 @@ jobs: # this job collects the six platform artifacts and uploads the complete set # as one artifact, so a caller downloads `ffi-tarballs` and has everything. needs: [binaries] - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 timeout-minutes: 45 steps: - uses: actions/checkout@v6 diff --git a/.github/workflows/miri.yml b/.github/workflows/miri.yml index 75711f5fd..ab5b9b6e0 100644 --- a/.github/workflows/miri.yml +++ b/.github/workflows/miri.yml @@ -40,7 +40,7 @@ env: jobs: miri-stack-guest-abi: name: Miri (stack-guest-abi) - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 timeout-minutes: 30 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 diff --git a/.github/workflows/tests-rust.yml b/.github/workflows/tests-rust.yml index 1a1bdc388..ac2415b2b 100644 --- a/.github/workflows/tests-rust.yml +++ b/.github/workflows/tests-rust.yml @@ -58,7 +58,7 @@ concurrency: jobs: rust: name: cargo test + clippy + rustfmt - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 timeout-minutes: 45 steps: - uses: actions/checkout@v6 diff --git a/scripts/ffi-release-matrix.mjs b/scripts/ffi-release-matrix.mjs index c4475fbf7..f41c15d21 100644 --- a/scripts/ffi-release-matrix.mjs +++ b/scripts/ffi-release-matrix.mjs @@ -52,7 +52,7 @@ const PLATFORMS_DIR = join( export function runnerFor(platform) { if (platform.startsWith('win32')) return 'windows-latest' if (platform.startsWith('darwin')) return 'macos-latest' - return 'blacksmith-4vcpu-ubuntu-2404' + return 'ubuntu-24.04' } /**