Skip to content

Commit 0354049

Browse files
committed
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.
1 parent 9c48e24 commit 0354049

File tree

10 files changed

+25
-25
lines changed

10 files changed

+25
-25
lines changed

.github/workflows/beta.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222

2323
jobs:
2424
build:
25-
runs-on: ubuntu-24.04
25+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
2626
container: ghcr.io/linkerd/dev:v46-rust
2727
timeout-minutes: 20
2828
continue-on-error: true

.github/workflows/coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
jobs:
2222
meta:
2323
timeout-minutes: 5
24-
runs-on: ubuntu-24.04
24+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
2525
steps:
2626
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2727
- id: changed
@@ -40,7 +40,7 @@ jobs:
4040
codecov:
4141
needs: meta
4242
if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || needs.meta.outputs.any_changed == 'true'
43-
runs-on: ubuntu-24.04
43+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
4444
timeout-minutes: 30
4545
container:
4646
image: docker://ghcr.io/linkerd/dev:v46-rust

.github/workflows/fuzzers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ permissions:
2626
jobs:
2727
list-changed:
2828
timeout-minutes: 3
29-
runs-on: ubuntu-24.04
29+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
3030
container: docker://rust:1.88.0
3131
steps:
3232
- run: apt update && apt install -y jo
@@ -47,7 +47,7 @@ jobs:
4747
build:
4848
needs: [list-changed]
4949
timeout-minutes: 40
50-
runs-on: ubuntu-24.04
50+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
5151
container: docker://rust:1.88.0
5252
strategy:
5353
matrix:

.github/workflows/markdown.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
markdownlint:
1414
timeout-minutes: 5
15-
runs-on: ubuntu-24.04
15+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
1616
steps:
1717
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1818
- uses: DavidAnson/markdownlint-cli2-action@992badcdf24e3b8eb7e87ff9287fe931bcb00c6e

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222

2323
jobs:
2424
build:
25-
runs-on: ubuntu-24.04
25+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
2626
container: ghcr.io/linkerd/dev:v46-rust
2727
timeout-minutes: 20
2828
continue-on-error: true

.github/workflows/pr.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414
jobs:
1515
meta:
1616
timeout-minutes: 5
17-
runs-on: ubuntu-24.04
17+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
1818
steps:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2020
- id: build
@@ -57,7 +57,7 @@ jobs:
5757
info:
5858
timeout-minutes: 3
5959
needs: meta
60-
runs-on: ubuntu-24.04
60+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
6161
steps:
6262
- name: Info
6363
run: |
@@ -74,7 +74,7 @@ jobs:
7474
actions:
7575
needs: meta
7676
if: needs.meta.outputs.actions_changed == 'true'
77-
runs-on: ubuntu-24.04
77+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
7878
steps:
7979
- uses: linkerd/dev/actions/setup-tools@v46
8080
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -84,7 +84,7 @@ jobs:
8484
rust:
8585
needs: meta
8686
if: needs.meta.outputs.cargo_changed == 'true' || needs.meta.outputs.rust_changed == 'true'
87-
runs-on: ubuntu-24.04
87+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
8888
container: ghcr.io/linkerd/dev:v46-rust
8989
permissions:
9090
contents: read
@@ -107,7 +107,7 @@ jobs:
107107
needs: meta
108108
if: needs.meta.outputs.cargo_changed == 'true'
109109
timeout-minutes: 20
110-
runs-on: ubuntu-24.04
110+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
111111
container: ghcr.io/linkerd/dev:v46-rust
112112
strategy:
113113
matrix:
@@ -123,7 +123,7 @@ jobs:
123123
needs: meta
124124
if: needs.meta.outputs.cargo_changed == 'true' || needs.meta.outputs.rust_changed == 'true'
125125
timeout-minutes: 20
126-
runs-on: ubuntu-24.04
126+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
127127
env:
128128
WAIT_TIMEOUT: 2m
129129
steps:
@@ -149,7 +149,7 @@ jobs:
149149
timeout-minutes: 3
150150
needs: [meta, actions, rust, rust-crates, linkerd-install]
151151
if: always()
152-
runs-on: ubuntu-24.04
152+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
153153

154154
permissions:
155155
contents: write

.github/workflows/release-weekly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313
jobs:
1414
last-release:
1515
if: github.repository == 'linkerd/linkerd2-proxy' # Don't run this in forks.
16-
runs-on: ubuntu-24.04
16+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
1717
timeout-minutes: 5
1818
env:
1919
GH_REPO: ${{ github.repository }}
@@ -41,7 +41,7 @@ jobs:
4141

4242
last-commit:
4343
needs: last-release
44-
runs-on: ubuntu-24.04
44+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
4545
timeout-minutes: 5
4646
steps:
4747
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -62,7 +62,7 @@ jobs:
6262
trigger-release:
6363
needs: [last-release, last-commit]
6464
if: needs.last-release.outputs.recent == 'false' && needs.last-commit.outputs.after-release == 'true'
65-
runs-on: ubuntu-24.04
65+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
6666
timeout-minutes: 5
6767
permissions:
6868
actions: write

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ concurrency:
5858
jobs:
5959
meta:
6060
timeout-minutes: 5
61-
runs-on: ubuntu-24.04
61+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
6262
steps:
6363
- id: meta
6464
env:
@@ -108,7 +108,7 @@ jobs:
108108

109109
info:
110110
needs: meta
111-
runs-on: ubuntu-24.04
111+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
112112
timeout-minutes: 3
113113
steps:
114114
- name: Inputs
@@ -140,7 +140,7 @@ jobs:
140140
# If we're not actually building on a release tag, don't short-circuit on
141141
# errors. This helps us know whether a failure is platform-specific.
142142
continue-on-error: ${{ needs.meta.outputs.publish != 'true' }}
143-
runs-on: ubuntu-24.04
143+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
144144
timeout-minutes: 40
145145
container: docker://ghcr.io/linkerd/dev:v46-rust-musl
146146
env:
@@ -170,7 +170,7 @@ jobs:
170170

171171
publish:
172172
needs: [meta, package]
173-
runs-on: ubuntu-24.04
173+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
174174
timeout-minutes: 5
175175
permissions:
176176
actions: write
@@ -225,7 +225,7 @@ jobs:
225225
needs: publish
226226
if: always()
227227
timeout-minutes: 3
228-
runs-on: ubuntu-24.04
228+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
229229
steps:
230230
- name: Results
231231
run: |

.github/workflows/shellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
jobs:
1414
sh-lint:
1515
timeout-minutes: 5
16-
runs-on: ubuntu-24.04
16+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
1717
steps:
1818
- uses: linkerd/dev/actions/setup-tools@v46
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

.github/workflows/toolchain.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313

1414
jobs:
1515
devcontainer:
16-
runs-on: ubuntu-24.04
16+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
1717
container: ghcr.io/linkerd/dev:v46-rust
1818
steps:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -35,7 +35,7 @@ jobs:
3535
3636
3737
workflows:
38-
runs-on: ubuntu-24.04
38+
runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }}
3939
steps:
4040
- uses: linkerd/dev/actions/setup-tools@v46
4141
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

0 commit comments

Comments
 (0)