From 081866845f648bdefec72dbd8e47e48101918c56 Mon Sep 17 00:00:00 2001 From: Will Sarg <12886992+willsarg@users.noreply.github.com> Date: Mon, 16 Feb 2026 16:08:02 -0500 Subject: [PATCH] fix(ci): standardize runner configuration for CI jobs --- .github/workflows/ci.yml | 8 +-- .github/workflows/workflow-sanity.yml | 100 +++++++++++++------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9a435c..e54657a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,7 +118,7 @@ jobs: name: Format & Lint needs: [changes] if: needs.changes.outputs.rust_changed == 'true' - runs-on: ${{ github.event_name == 'push' && fromJSON('["self-hosted","Linux","X64","lxc-ci"]') || 'ubuntu-latest' }} + runs-on: blacksmith-2vcpu-ubuntu-2404 timeout-minutes: 20 steps: - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 @@ -138,7 +138,7 @@ jobs: name: Test needs: [changes] if: needs.changes.outputs.rust_changed == 'true' - runs-on: ${{ github.event_name == 'push' && fromJSON('["self-hosted","Linux","X64","lxc-ci"]') || 'ubuntu-latest' }} + runs-on: blacksmith-2vcpu-ubuntu-240 timeout-minutes: 30 steps: - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 @@ -153,7 +153,7 @@ jobs: name: Build (Smoke) needs: [changes] if: needs.changes.outputs.rust_changed == 'true' - runs-on: ${{ github.event_name == 'push' && fromJSON('["self-hosted","Linux","X64","lxc-ci"]') || 'ubuntu-latest' }} + runs-on: blacksmith-2vcpu-ubuntu-240 timeout-minutes: 20 steps: @@ -187,7 +187,7 @@ jobs: name: Docs Quality needs: [changes] if: needs.changes.outputs.docs_changed == 'true' - runs-on: ${{ github.event_name == 'push' && fromJSON('["self-hosted","Linux","X64","lxc-ci"]') || 'ubuntu-latest' }} + runs-on: blacksmith-2vcpu-ubuntu-240 timeout-minutes: 15 steps: - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 diff --git a/.github/workflows/workflow-sanity.yml b/.github/workflows/workflow-sanity.yml index e16df72..4948902 100644 --- a/.github/workflows/workflow-sanity.yml +++ b/.github/workflows/workflow-sanity.yml @@ -1,65 +1,65 @@ name: Workflow Sanity on: - pull_request: - paths: - - ".github/workflows/**" - - ".github/*.yml" - - ".github/*.yaml" - push: - branches: [main] - paths: - - ".github/workflows/**" - - ".github/*.yml" - - ".github/*.yaml" + pull_request: + paths: + - ".github/workflows/**" + - ".github/*.yml" + - ".github/*.yaml" + push: + branches: [main] + paths: + - ".github/workflows/**" + - ".github/*.yml" + - ".github/*.yaml" concurrency: - group: workflow-sanity-${{ github.event.pull_request.number || github.sha }} - cancel-in-progress: true + group: workflow-sanity-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true permissions: - contents: read + contents: read jobs: - no-tabs: - runs-on: ${{ github.event_name == 'push' && fromJSON('["self-hosted","Linux","X64","lxc-ci"]') || 'ubuntu-latest' }} - timeout-minutes: 10 - steps: - - name: Checkout - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + no-tabs: + runs-on: blacksmith-2vcpu-ubuntu-240 + timeout-minutes: 10 + steps: + - name: Checkout + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 - - name: Fail on tabs in workflow files - shell: bash - run: | - set -euo pipefail - python - <<'PY' - from __future__ import annotations + - name: Fail on tabs in workflow files + shell: bash + run: | + set -euo pipefail + python - <<'PY' + from __future__ import annotations - import pathlib - import sys + import pathlib + import sys - root = pathlib.Path(".github/workflows") - bad: list[str] = [] - for path in sorted(root.rglob("*.yml")): - if b"\t" in path.read_bytes(): - bad.append(str(path)) - for path in sorted(root.rglob("*.yaml")): - if b"\t" in path.read_bytes(): - bad.append(str(path)) + root = pathlib.Path(".github/workflows") + bad: list[str] = [] + for path in sorted(root.rglob("*.yml")): + if b"\t" in path.read_bytes(): + bad.append(str(path)) + for path in sorted(root.rglob("*.yaml")): + if b"\t" in path.read_bytes(): + bad.append(str(path)) - if bad: - print("Tabs found in workflow file(s):") - for path in bad: - print(f"- {path}") - sys.exit(1) - PY + if bad: + print("Tabs found in workflow file(s):") + for path in bad: + print(f"- {path}") + sys.exit(1) + PY - actionlint: - runs-on: ${{ github.event_name == 'push' && fromJSON('["self-hosted","Linux","X64","lxc-ci"]') || 'ubuntu-latest' }} - timeout-minutes: 10 - steps: - - name: Checkout - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + actionlint: + runs-on: blacksmith-2vcpu-ubuntu-240 + timeout-minutes: 10 + steps: + - name: Checkout + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 - - name: Lint GitHub workflows - uses: rhysd/actionlint@393031adb9afb225ee52ae2ccd7a5af5525e03e8 # v1.7.11 + - name: Lint GitHub workflows + uses: rhysd/actionlint@393031adb9afb225ee52ae2ccd7a5af5525e03e8 # v1.7.11