Skip to content

Commit b60d7c2

Browse files
committed
Revert "[libc++][WIP] Try to target a runner group directly"
This reverts commit c86afc4.
1 parent c86afc4 commit b60d7c2

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
@@ -49,8 +49,7 @@ env:
4949
jobs:
5050
stage1:
5151
if: github.repository_owner == 'llvm'
52-
runs-on:
53-
group: fozzie-runners-1
52+
runs-on: libcxx-runners-set
5453
container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
5554
continue-on-error: false
5655
strategy:
@@ -87,8 +86,7 @@ jobs:
8786
**/crash_diagnostics/*
8887
stage2:
8988
if: github.repository_owner == 'llvm'
90-
runs-on:
91-
group: fozzie-runners-1
89+
runs-on: libcxx-runners-set
9290
container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
9391
needs: [ stage1 ]
9492
continue-on-error: false
@@ -163,21 +161,20 @@ jobs:
163161
'generic-static',
164162
'bootstrapping-build'
165163
]
166-
machine: [ 'fozzie-runners-1' ]
164+
machine: [ 'libcxx-runners-set' ]
167165
include:
168166
- config: 'generic-cxx26'
169-
machine: fozzie-runners-1
167+
machine: libcxx-runners-set
170168
- config: 'generic-asan'
171-
machine: fozzie-runners-1
169+
machine: libcxx-runners-set
172170
- config: 'generic-tsan'
173-
machine: fozzie-runners-1
171+
machine: libcxx-runners-set
174172
- config: 'generic-ubsan'
175-
machine: fozzie-runners-1
173+
machine: libcxx-runners-set
176174
# Use a larger machine for MSAN to avoid timeout and memory allocation issues.
177175
- config: 'generic-msan'
178-
machine: fozzie-runners-1
179-
runs-on:
180-
group: ${{ matrix.machine }}
176+
machine: libcxx-runners-set
177+
runs-on: ${{ matrix.machine }}
181178
container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
182179
steps:
183180
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)