From 0354049e4434823b21daddb0a38c937538968fe9 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Thu, 17 Jul 2025 18:51:31 +0000 Subject: [PATCH] chore(ci): enable overriding the runner in workflows We use the ubuntu-24.04 runner by default, but in forks this may not be appropriate. This change updates the runners to support overriding via the LINKERD2_PROXY_RUNNER variable. --- .github/workflows/beta.yml | 2 +- .github/workflows/coverage.yml | 4 ++-- .github/workflows/fuzzers.yml | 4 ++-- .github/workflows/markdown.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/pr.yml | 14 +++++++------- .github/workflows/release-weekly.yml | 6 +++--- .github/workflows/release.yml | 10 +++++----- .github/workflows/shellcheck.yml | 2 +- .github/workflows/toolchain.yml | 4 ++-- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index cd2562d7b3..b337ac34cd 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -22,7 +22,7 @@ permissions: jobs: build: - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} container: ghcr.io/linkerd/dev:v46-rust timeout-minutes: 20 continue-on-error: true diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index ed64bbf677..76e22b8adb 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -21,7 +21,7 @@ env: jobs: meta: timeout-minutes: 5 - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: changed @@ -40,7 +40,7 @@ jobs: codecov: needs: meta if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || needs.meta.outputs.any_changed == 'true' - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} timeout-minutes: 30 container: image: docker://ghcr.io/linkerd/dev:v46-rust diff --git a/.github/workflows/fuzzers.yml b/.github/workflows/fuzzers.yml index 358ec22633..0ef2721388 100644 --- a/.github/workflows/fuzzers.yml +++ b/.github/workflows/fuzzers.yml @@ -26,7 +26,7 @@ permissions: jobs: list-changed: timeout-minutes: 3 - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} container: docker://rust:1.88.0 steps: - run: apt update && apt install -y jo @@ -47,7 +47,7 @@ jobs: build: needs: [list-changed] timeout-minutes: 40 - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} container: docker://rust:1.88.0 strategy: matrix: diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index 7c2f79bf78..4cf3c2db92 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -12,7 +12,7 @@ on: jobs: markdownlint: timeout-minutes: 5 - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: DavidAnson/markdownlint-cli2-action@992badcdf24e3b8eb7e87ff9287fe931bcb00c6e diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 94153b6656..85c8a41e8e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ permissions: jobs: build: - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} container: ghcr.io/linkerd/dev:v46-rust timeout-minutes: 20 continue-on-error: true diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a08a99b7dd..90af70de66 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,7 +14,7 @@ concurrency: jobs: meta: timeout-minutes: 5 - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: build @@ -57,7 +57,7 @@ jobs: info: timeout-minutes: 3 needs: meta - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - name: Info run: | @@ -74,7 +74,7 @@ jobs: actions: needs: meta if: needs.meta.outputs.actions_changed == 'true' - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - uses: linkerd/dev/actions/setup-tools@v46 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 @@ -84,7 +84,7 @@ jobs: rust: needs: meta if: needs.meta.outputs.cargo_changed == 'true' || needs.meta.outputs.rust_changed == 'true' - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} container: ghcr.io/linkerd/dev:v46-rust permissions: contents: read @@ -107,7 +107,7 @@ jobs: needs: meta if: needs.meta.outputs.cargo_changed == 'true' timeout-minutes: 20 - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} container: ghcr.io/linkerd/dev:v46-rust strategy: matrix: @@ -123,7 +123,7 @@ jobs: needs: meta if: needs.meta.outputs.cargo_changed == 'true' || needs.meta.outputs.rust_changed == 'true' timeout-minutes: 20 - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} env: WAIT_TIMEOUT: 2m steps: @@ -149,7 +149,7 @@ jobs: timeout-minutes: 3 needs: [meta, actions, rust, rust-crates, linkerd-install] if: always() - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} permissions: contents: write diff --git a/.github/workflows/release-weekly.yml b/.github/workflows/release-weekly.yml index 2154e19e73..562e5eefa8 100644 --- a/.github/workflows/release-weekly.yml +++ b/.github/workflows/release-weekly.yml @@ -13,7 +13,7 @@ concurrency: jobs: last-release: if: github.repository == 'linkerd/linkerd2-proxy' # Don't run this in forks. - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} timeout-minutes: 5 env: GH_REPO: ${{ github.repository }} @@ -41,7 +41,7 @@ jobs: last-commit: needs: last-release - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} timeout-minutes: 5 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 @@ -62,7 +62,7 @@ jobs: trigger-release: needs: [last-release, last-commit] if: needs.last-release.outputs.recent == 'false' && needs.last-commit.outputs.after-release == 'true' - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} timeout-minutes: 5 permissions: actions: write diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c3de1320db..5875d9ff86 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,7 +58,7 @@ concurrency: jobs: meta: timeout-minutes: 5 - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - id: meta env: @@ -108,7 +108,7 @@ jobs: info: needs: meta - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} timeout-minutes: 3 steps: - name: Inputs @@ -140,7 +140,7 @@ jobs: # If we're not actually building on a release tag, don't short-circuit on # errors. This helps us know whether a failure is platform-specific. continue-on-error: ${{ needs.meta.outputs.publish != 'true' }} - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} timeout-minutes: 40 container: docker://ghcr.io/linkerd/dev:v46-rust-musl env: @@ -170,7 +170,7 @@ jobs: publish: needs: [meta, package] - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} timeout-minutes: 5 permissions: actions: write @@ -225,7 +225,7 @@ jobs: needs: publish if: always() timeout-minutes: 3 - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - name: Results run: | diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index e3e31ee895..dde201f49e 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -13,7 +13,7 @@ on: jobs: sh-lint: timeout-minutes: 5 - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - uses: linkerd/dev/actions/setup-tools@v46 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml index b339f88a57..728864484f 100644 --- a/.github/workflows/toolchain.yml +++ b/.github/workflows/toolchain.yml @@ -13,7 +13,7 @@ permissions: jobs: devcontainer: - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} container: ghcr.io/linkerd/dev:v46-rust steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 @@ -35,7 +35,7 @@ jobs: workflows: - runs-on: ubuntu-24.04 + runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - uses: linkerd/dev/actions/setup-tools@v46 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683