Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

ci(verify): run the macOS engine suites on Blacksmith

Richie McIlroyad4d1b8fed69
diff --git a/.github/actions/engine-verify-setup/action.yml b/.github/actions/engine-verify-setup/action.yml
index bbd14a3f7..b683989ea 100644
--- a/.github/actions/engine-verify-setup/action.yml
+++ b/.github/actions/engine-verify-setup/action.yml
@@ -60,7 +60,10 @@ runs:
if: inputs.rust-cache == 'true'
shell: bash
run: |
- base="verify-build-v3-${{ inputs.target }}-$(date -u +%G-W%V)"
+ # runner.environment separates GitHub-hosted from self-hosted
+ # (Blacksmith) builds: their paths and toolchains differ, so one's
+ # target directory would only force a rebuild on the other.
+ base="verify-build-v3-${{ inputs.target }}-${{ runner.environment }}-$(date -u +%G-W%V)"
echo "base=$base" >> "$GITHUB_OUTPUT"
echo "key=$base-${{ hashFiles('Cargo.lock', 'Cargo.toml', 'rust-toolchain.toml') }}-$(date -u +%Y%m%d)" >> "$GITHUB_OUTPUT"
@@ -126,4 +129,4 @@ runs:
uses: actions/cache/restore@v4
with:
path: ${{ runner.temp }}/verify-fixtures
- key: verify-fixtures-v1-${{ runner.os }}-${{ inputs.tier }}-${{ hashFiles('crates/**/src/**', 'crates/**/Cargo.toml', 'Cargo.lock', 'scripts/setup.js') }}
+ key: verify-fixtures-v1-${{ runner.os }}-${{ runner.environment }}-${{ inputs.tier }}-${{ hashFiles('crates/**/src/**', 'crates/**/Cargo.toml', 'Cargo.lock', 'scripts/setup.js') }}
diff --git a/.github/workflows/engine-verify.yml b/.github/workflows/engine-verify.yml
index bfd410763..381544265 100644
--- a/.github/workflows/engine-verify.yml
+++ b/.github/workflows/engine-verify.yml
@@ -178,6 +178,12 @@ jobs:
MAX: ${{ steps.files.outputs.max }}
SUITES: ${{ inputs.suites }}
RUSTUP_TOOLCHAIN: stable
+ # Runner labels live in scripts/verify/suites.json (macOS:
+ # Blacksmith). A repository variable overrides one without a code
+ # change, e.g. ENGINE_VERIFY_MACOS_RUNNER=macos-15 for GitHub-hosted.
+ ENGINE_VERIFY_MACOS_RUNNER: ${{ vars.ENGINE_VERIFY_MACOS_RUNNER }}
+ ENGINE_VERIFY_LINUX_RUNNER: ${{ vars.ENGINE_VERIFY_LINUX_RUNNER }}
+ ENGINE_VERIFY_WINDOWS_RUNNER: ${{ vars.ENGINE_VERIFY_WINDOWS_RUNNER }}
run: |
set -euo pipefail
if [[ "$SCOPE" == all ]]; then
diff --git a/scripts/verify/plan.py b/scripts/verify/plan.py
index cf1d9acee..104487cd2 100755
--- a/scripts/verify/plan.py
+++ b/scripts/verify/plan.py
@@ -248,6 +248,13 @@ def matrix(config, names, tier):
if not suites:
continue
runner = dict(config["runners"][platform])
+ # One switch per platform without a code change: the repository
+ # variable ENGINE_VERIFY_<PLATFORM>_RUNNER (passed in by
+ # engine-verify.yml) overrides suites.json, e.g. macos-15 to go back
+ # to GitHub-hosted runners.
+ override = os.environ.get(f"ENGINE_VERIFY_{platform.upper()}_RUNNER", "").strip()
+ if override:
+ runner["runner"] = override
if isinstance(runner["shards"], dict):
runner["shards"] = runner["shards"][tier]
include.append({
diff --git a/scripts/verify/suites.json b/scripts/verify/suites.json
index 5903e7693..561a786c9 100644
--- a/scripts/verify/suites.json
+++ b/scripts/verify/suites.json
@@ -191,7 +191,7 @@
"archive": false
},
"macos": {
- "runner": "macos-15",
+ "runner": "blacksmith-6vcpu-macos-15",
"target": "aarch64-apple-darwin",
"shards": {
"fast": 1,