Skip to content

Commit 0572430

Browse files
committed
Check for large runners
Variable | Runner to use if set to `1` -|- `use-large-linux-runners-for-speed` | `ubuntu-latest-xl` `use-large-mac-runners-for-speed` | `mac-12-xl` `use-large-win-runners-for-speed` | `windows-latest-xl`
1 parent aeae208 commit 0572430

File tree

8 files changed

+111
-17
lines changed

8 files changed

+111
-17
lines changed

.github/workflows/compile-queries.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,18 @@ on:
99
pull_request:
1010

1111
jobs:
12+
choose-runner:
13+
runs-on: ubuntu-latest
14+
outputs:
15+
mac-12: ${{ vars.use-large-mac-runners-for-speed && 'mac-12-xl' || 'mac-12' }}
16+
ubuntu-latest: ${{ vars.use-large-linux-runners-for-speed && 'ubuntu-latest-xl' || 'ubuntu-latest' }}
17+
windows-latest: ${{ vars.use-large-win-runners-for-speed && 'windows-latest-xl' || 'windows-latest' }}
18+
steps:
19+
- run: true
20+
1221
compile-queries:
13-
runs-on: ubuntu-latest-xl
22+
needs: choose-runner
23+
runs-on: ${{ needs.choose-runner.outputs.ubuntu-latest }}
1424

1525
steps:
1626
- uses: actions/checkout@v4

.github/workflows/csharp-qltest.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,19 @@ jobs:
4545
--dbscheme=ql/lib/semmlecode.csharp.dbscheme --target-dbscheme=downgrades/initial/semmlecode.csharp.dbscheme |
4646
xargs codeql execute upgrades testdb
4747
diff -q testdb/semmlecode.csharp.dbscheme downgrades/initial/semmlecode.csharp.dbscheme
48+
49+
choose-runner:
50+
runs-on: ubuntu-latest
51+
outputs:
52+
mac-12: ${{ vars.use-large-mac-runners-for-speed && 'mac-12-xl' || 'mac-12' }}
53+
ubuntu-latest: ${{ vars.use-large-linux-runners-for-speed && 'ubuntu-latest-xl' || 'ubuntu-latest' }}
54+
windows-latest: ${{ vars.use-large-win-runners-for-speed && 'windows-latest-xl' || 'windows-latest' }}
55+
steps:
56+
- run: true
57+
4858
qltest:
49-
runs-on: ubuntu-latest-xl
59+
needs: choose-runner
60+
runs-on: ${{ needs.choose-runner.outputs.ubuntu-latest }}
5061
strategy:
5162
fail-fast: false
5263
matrix:

.github/workflows/go-tests-other-os.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,19 @@ jobs:
4545
cd go
4646
make test cache="${{ steps.query-cache.outputs.cache-dir }}"
4747
48+
choose-runner:
49+
runs-on: ubuntu-latest
50+
outputs:
51+
mac-12: ${{ vars.use-large-mac-runners-for-speed && 'mac-12-xl' || 'mac-12' }}
52+
ubuntu-latest: ${{ vars.use-large-linux-runners-for-speed && 'ubuntu-latest-xl' || 'ubuntu-latest' }}
53+
windows-latest: ${{ vars.use-large-win-runners-for-speed && 'windows-latest-xl' || 'windows-latest' }}
54+
steps:
55+
- run: true
56+
4857
test-win:
4958
name: Test Windows
50-
runs-on: windows-latest-xl
59+
needs: choose-runner
60+
runs-on: ${{ needs.choose-runner.outputs.windows-latest }}
5161
steps:
5262
- name: Set up Go ${{ env.GO_VERSION }}
5363
uses: actions/setup-go@v5

.github/workflows/go-tests.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,19 @@ on:
1818
env:
1919
GO_VERSION: '~1.21.0'
2020
jobs:
21+
choose-runner:
22+
runs-on: ubuntu-latest
23+
outputs:
24+
mac-12: ${{ vars.use-large-mac-runners-for-speed && 'mac-12-xl' || 'mac-12' }}
25+
ubuntu-latest: ${{ vars.use-large-linux-runners-for-speed && 'ubuntu-latest-xl' || 'ubuntu-latest' }}
26+
windows-latest: ${{ vars.use-large-win-runners-for-speed && 'windows-latest-xl' || 'windows-latest' }}
27+
steps:
28+
- run: true
29+
2130
test-linux:
2231
name: Test Linux (Ubuntu)
23-
runs-on: ubuntu-latest-xl
32+
needs: choose-runner
33+
runs-on: ${{ needs.choose-runner.outputs.ubuntu-latest }}
2434
steps:
2535
- name: Set up Go ${{ env.GO_VERSION }}
2636
uses: actions/setup-go@v5

.github/workflows/ql-for-ql-build.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,18 @@ env:
1010
CARGO_TERM_COLOR: always
1111

1212
jobs:
13+
choose-runner:
14+
runs-on: ubuntu-latest
15+
outputs:
16+
mac-12: ${{ vars.use-large-mac-runners-for-speed && 'mac-12-xl' || 'mac-12' }}
17+
ubuntu-latest: ${{ vars.use-large-linux-runners-for-speed && 'ubuntu-latest-xl' || 'ubuntu-latest' }}
18+
windows-latest: ${{ vars.use-large-win-runners-for-speed && 'windows-latest-xl' || 'windows-latest' }}
19+
steps:
20+
- run: true
21+
1322
analyze:
14-
runs-on: ubuntu-latest-xl
23+
needs: choose-runner
24+
runs-on: ${{ needs.choose-runner.outputs.ubuntu-latest }}
1525
steps:
1626
### Build the queries ###
1727
- uses: actions/checkout@v4

.github/workflows/ruby-build.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,21 @@ jobs:
110110
ruby/extractor/target/release/codeql-extractor-ruby
111111
ruby/extractor/target/release/codeql-extractor-ruby.exe
112112
retention-days: 1
113+
choose-runner:
114+
defaults:
115+
run:
116+
working-directory: /tmp
117+
runs-on: ubuntu-latest
118+
outputs:
119+
mac-12: ${{ vars.use-large-mac-runners-for-speed && 'mac-12-xl' || 'mac-12' }}
120+
ubuntu-latest: ${{ vars.use-large-linux-runners-for-speed && 'ubuntu-latest-xl' || 'ubuntu-latest' }}
121+
windows-latest: ${{ vars.use-large-win-runners-for-speed && 'windows-latest-xl' || 'windows-latest' }}
122+
steps:
123+
- run: true
124+
113125
compile-queries:
114-
runs-on: ubuntu-latest-xl
126+
needs: choose-runner
127+
runs-on: ${{ needs.choose-runner.outputs.ubuntu-latest }}
115128
steps:
116129
- uses: actions/checkout@v4
117130
- name: Fetch CodeQL

.github/workflows/ruby-qltest.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,19 @@ jobs:
4949
--dbscheme=ql/lib/ruby.dbscheme --target-dbscheme=downgrades/initial/ruby.dbscheme |
5050
xargs codeql execute upgrades testdb
5151
diff -q testdb/ruby.dbscheme downgrades/initial/ruby.dbscheme
52+
53+
choose-runner:
54+
runs-on: ubuntu-latest
55+
outputs:
56+
mac-12: ${{ vars.use-large-mac-runners-for-speed && 'mac-12-xl' || 'mac-12' }}
57+
ubuntu-latest: ${{ vars.use-large-linux-runners-for-speed && 'ubuntu-latest-xl' || 'ubuntu-latest' }}
58+
windows-latest: ${{ vars.use-large-win-runners-for-speed && 'windows-latest-xl' || 'windows-latest' }}
59+
steps:
60+
- run: true
61+
5262
qltest:
53-
runs-on: ubuntu-latest-xl
63+
needs: choose-runner
64+
runs-on: ${{ needs.choose-runner.outputs.ubuntu-latest }}
5465
strategy:
5566
fail-fast: false
5667
steps:

.github/workflows/swift.yml

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,41 +34,60 @@ on:
3434
- codeql-cli-*
3535

3636
jobs:
37+
choose-runner:
38+
runs-on: ubuntu-latest
39+
outputs:
40+
mac-12: ${{ vars.use-large-mac-runners-for-speed && 'mac-12-xl' || 'mac-12' }}
41+
ubuntu-latest: ${{ vars.use-large-linux-runners-for-speed && 'ubuntu-latest-xl' || 'ubuntu-latest' }}
42+
windows-latest: ${{ vars.use-large-win-runners-for-speed && 'windows-latest-xl' || 'windows-latest' }}
43+
steps:
44+
- run: true
45+
3746
# not using a matrix as you cannot depend on a specific job in a matrix, and we want to start linux checks
3847
# without waiting for the macOS build
3948
build-and-test-macos:
40-
runs-on: macos-12-xl
49+
needs: choose-runner
50+
runs-on: ${{ needs.choose-runner.outputs.mac-12 }}
4151
steps:
4252
- uses: actions/checkout@v4
4353
- uses: ./swift/actions/build-and-test
4454
build-and-test-linux:
45-
runs-on: ubuntu-latest-xl
55+
needs: choose-runner
56+
runs-on: ${{ needs.choose-runner.outputs.ubuntu-latest }}
4657
steps:
4758
- uses: actions/checkout@v4
4859
- uses: ./swift/actions/build-and-test
4960
qltests-linux:
50-
needs: build-and-test-linux
51-
runs-on: ubuntu-latest-xl
61+
needs:
62+
- build-and-test-linux
63+
- choose-runner
64+
runs-on: ${{ needs.choose-runner.outputs.ubuntu-latest }}
5265
steps:
5366
- uses: actions/checkout@v4
5467
- uses: ./swift/actions/run-ql-tests
5568
qltests-macos:
5669
if : ${{ github.event_name == 'pull_request' }}
57-
needs: build-and-test-macos
58-
runs-on: macos-12-xl
70+
needs:
71+
- build-and-test-macos
72+
- choose-runner
73+
runs-on: ${{ needs.choose-runner.outputs.mac-12 }}
5974
steps:
6075
- uses: actions/checkout@v4
6176
- uses: ./swift/actions/run-ql-tests
6277
integration-tests-linux:
63-
needs: build-and-test-linux
64-
runs-on: ubuntu-latest-xl
78+
needs:
79+
- build-and-test-linux
80+
- choose-runner
81+
runs-on: ${{ needs.choose-runner.outputs.ubuntu-latest }}
6582
steps:
6683
- uses: actions/checkout@v4
6784
- uses: ./swift/actions/run-integration-tests
6885
integration-tests-macos:
6986
if : ${{ github.event_name == 'pull_request' }}
70-
needs: build-and-test-macos
71-
runs-on: macos-12-xl
87+
needs:
88+
- build-and-test-macos
89+
- choose-runner
90+
runs-on: ${{ needs.choose-runner.outputs.mac-12 }}
7291
timeout-minutes: 60
7392
steps:
7493
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)