From d8913d390146f40045e22a283bd15258057d70a7 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Wed, 22 Apr 2026 17:30:54 +0100 Subject: [PATCH] ci: offload short linux checks --- .github/workflows/ci.yml | 22 +++++++++++----------- docs/ci.md | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95500243887..307358fdaf5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -550,7 +550,7 @@ jobs: name: ${{ matrix.check_name }} needs: [preflight] if: needs.preflight.outputs.run_checks_fast == 'true' - runs-on: ${{ github.repository == 'openclaw/openclaw' && 'blacksmith-8vcpu-ubuntu-2404' || 'ubuntu-24.04' }} + runs-on: ubuntu-24.04 timeout-minutes: 60 strategy: fail-fast: false @@ -744,7 +744,7 @@ jobs: name: "checks-fast-protocol" needs: [preflight] if: needs.preflight.outputs.run_checks_fast == 'true' - runs-on: ${{ github.repository == 'openclaw/openclaw' && 'blacksmith-8vcpu-ubuntu-2404' || 'ubuntu-24.04' }} + runs-on: ubuntu-24.04 timeout-minutes: 30 steps: - name: Checkout @@ -1461,22 +1461,22 @@ jobs: include: - check_name: check-preflight-guards task: preflight-guards - runner: blacksmith-8vcpu-ubuntu-2404 + runner: ubuntu-24.04 - check_name: check-prod-types task: prod-types - runner: blacksmith-8vcpu-ubuntu-2404 + runner: ubuntu-24.04 - check_name: check-lint task: lint runner: blacksmith-16vcpu-ubuntu-2404 - check_name: check-policy-guards task: policy-guards - runner: blacksmith-8vcpu-ubuntu-2404 + runner: ubuntu-24.04 - check_name: check-test-types task: test-types - runner: blacksmith-8vcpu-ubuntu-2404 + runner: ubuntu-24.04 - check_name: check-strict-smoke task: strict-smoke - runner: blacksmith-8vcpu-ubuntu-2404 + runner: ubuntu-24.04 steps: - name: Checkout shell: bash @@ -1592,7 +1592,7 @@ jobs: name: ${{ matrix.check_name }} needs: [preflight] if: ${{ !cancelled() && always() && needs.preflight.outputs.run_check_additional == 'true' }} - runs-on: ${{ github.repository == 'openclaw/openclaw' && 'blacksmith-8vcpu-ubuntu-2404' || 'ubuntu-24.04' }} + runs-on: ubuntu-24.04 timeout-minutes: 20 strategy: fail-fast: false @@ -1812,7 +1812,7 @@ jobs: name: "build-smoke" needs: [preflight, build-artifacts] if: ${{ !cancelled() && always() && needs.preflight.outputs.run_build_smoke == 'true' && (github.event_name != 'push' || needs.build-artifacts.result == 'success') }} - runs-on: ${{ github.repository == 'openclaw/openclaw' && 'blacksmith-8vcpu-ubuntu-2404' || 'ubuntu-24.04' }} + runs-on: ubuntu-24.04 timeout-minutes: 20 steps: - name: Checkout @@ -1908,7 +1908,7 @@ jobs: contents: read needs: [preflight] if: needs.preflight.outputs.run_check_docs == 'true' - runs-on: ${{ github.repository == 'openclaw/openclaw' && 'blacksmith-8vcpu-ubuntu-2404' || 'ubuntu-24.04' }} + runs-on: ubuntu-24.04 timeout-minutes: 20 steps: - name: Checkout @@ -1972,7 +1972,7 @@ jobs: contents: read needs: [preflight] if: needs.preflight.outputs.run_skills_python_job == 'true' - runs-on: ${{ github.repository == 'openclaw/openclaw' && 'blacksmith-8vcpu-ubuntu-2404' || 'ubuntu-24.04' }} + runs-on: ubuntu-24.04 timeout-minutes: 20 steps: - name: Checkout diff --git a/docs/ci.md b/docs/ci.md index 8919e860d82..6e699bcaf8f 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -58,14 +58,14 @@ The CI concurrency key is versioned (`CI-v2-*`) so a GitHub-side zombie in an ol ## Runners -| Runner | Jobs | -| -------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `ubuntu-24.04` | `preflight`, fast security jobs and aggregates (`security-scm-fast`, `security-dependency-audit`, `security-fast`), sharded channel contract checks, short aggregate verifier jobs (`check`, `check-additional`, `checks-fast-contracts-channels`), workflow-sanity, labeler, auto-response; install-smoke preflight also uses GitHub-hosted Ubuntu so the Blacksmith matrix can queue earlier | -| `blacksmith-8vcpu-ubuntu-2404` | `build-artifacts`, Linux checks except `check-lint` and channel contracts, long-matrix aggregate verifiers, docs checks, Python skills, `android` | -| `blacksmith-16vcpu-ubuntu-2404` | `check-lint`, which remains CPU-sensitive enough that 8 vCPU cost more than it saved | -| `blacksmith-16vcpu-windows-2025` | `checks-windows` | -| `blacksmith-6vcpu-macos-latest` | `macos-node` on `openclaw/openclaw`; forks fall back to `macos-latest` | -| `blacksmith-12vcpu-macos-latest` | `macos-swift` on `openclaw/openclaw`; forks fall back to `macos-latest` | +| Runner | Jobs | +| -------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `ubuntu-24.04` | `preflight`, fast security jobs and aggregates (`security-scm-fast`, `security-dependency-audit`, `security-fast`), fast protocol/contract/bundled checks, sharded channel contract checks, `check` shards except lint, `check-additional` shards and aggregates, docs checks, Python skills, build-smoke, workflow-sanity, labeler, auto-response; install-smoke preflight also uses GitHub-hosted Ubuntu so the Blacksmith matrix can queue earlier | +| `blacksmith-8vcpu-ubuntu-2404` | `build-artifacts`, Linux Node test shards, bundled plugin test shards, remaining built-artifact consumers, `android` | +| `blacksmith-16vcpu-ubuntu-2404` | `check-lint`, which remains CPU-sensitive enough that 8 vCPU cost more than it saved | +| `blacksmith-16vcpu-windows-2025` | `checks-windows` | +| `blacksmith-6vcpu-macos-latest` | `macos-node` on `openclaw/openclaw`; forks fall back to `macos-latest` | +| `blacksmith-12vcpu-macos-latest` | `macos-swift` on `openclaw/openclaw`; forks fall back to `macos-latest` | ## Local Equivalents