Skip to content

Commit 4596dd1

Browse files
authored
Change how libc++ specifies the runners to use. (llvm#74188)
Github actions has some quirks with how you use runner groups, labels, names, etc... One of them is that groups can't "group" more than one set of builders. To do that, you use the same name. So now we're specifying the name.
1 parent 57eb482 commit 4596dd1

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

.github/workflows/libcxx-build-and-test.yaml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ env:
5050
jobs:
5151
stage1:
5252
if: github.repository_owner == 'llvm'
53-
runs-on:
54-
group: libcxx-runners-8
53+
runs-on: libcxx-runners-8-set
5554
continue-on-error: false
5655
strategy:
5756
fail-fast: true
@@ -89,8 +88,7 @@ jobs:
8988
**/crash_diagnostics/*
9089
stage2:
9190
if: github.repository_owner == 'llvm'
92-
runs-on:
93-
group: libcxx-runners-8
91+
runs-on: libcxx-runners-8-set
9492
needs: [ stage1 ]
9593
continue-on-error: false
9694
strategy:
@@ -169,27 +167,26 @@ jobs:
169167
'benchmarks',
170168
'bootstrapping-build'
171169
]
172-
machine: [ 'libcxx-runners-8' ]
170+
machine: [ 'libcxx-runners-8-set' ]
173171
std_modules: [ 'OFF' ]
174172
include:
175173
- config: 'generic-cxx26'
176-
machine: libcxx-runners-8
174+
machine: libcxx-runners-8-set
177175
std_modules: 'ON'
178176
- config: 'generic-asan'
179-
machine: libcxx-runners-8
177+
machine: libcxx-runners-8-set
180178
std_modules: 'OFF'
181179
- config: 'generic-tsan'
182-
machine: libcxx-runners-8
180+
machine: libcxx-runners-8-set
183181
std_modules: 'OFF'
184182
- config: 'generic-ubsan'
185-
machine: libcxx-runners-8
183+
machine: libcxx-runners-8-set
186184
std_modules: 'OFF'
187185
# Use a larger machine for MSAN to avoid timeout and memory allocation issues.
188186
- config: 'generic-msan'
189-
machine: libcxx-runners-32
187+
machine: libcxx-runners-32-set
190188
std_modules: 'OFF'
191-
runs-on:
192-
group: ${{ matrix.machine }}
189+
runs-on: ${{ matrix.machine }}
193190
steps:
194191
- uses: actions/checkout@v4
195192
- name: ${{ matrix.config }}

0 commit comments

Comments
 (0)