Skip to content

Commit 582cfb1

Browse files
authored
[libc++] Switch over to the LLVM-wide premerge test runners. (#147794)
Update the premerge testing system to use the LLVM-wide premerge infrastructure. Also remove libcxx-restart-preempted-jobs.yaml, as this should no longer be needed.
1 parent ca888f0 commit 582cfb1

File tree

2 files changed

+8
-169
lines changed

2 files changed

+8
-169
lines changed

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ concurrency:
3636
jobs:
3737
stage1:
3838
if: github.repository_owner == 'llvm'
39-
runs-on: libcxx-self-hosted-linux
40-
container: ghcr.io/llvm/libcxx-linux-builder:b060022103f551d8ca1dad84122ef73927c86512
39+
runs-on: llvm-premerge-libcxx-runners
4140
continue-on-error: false
4241
strategy:
4342
fail-fast: false
@@ -74,8 +73,7 @@ jobs:
7473
**/crash_diagnostics/*
7574
stage2:
7675
if: github.repository_owner == 'llvm'
77-
runs-on: libcxx-self-hosted-linux
78-
container: ghcr.io/llvm/libcxx-linux-builder:2b57ebb50b6d418e70382e655feaa619b558e254
76+
runs-on: llvm-premerge-libcxx-runners
7977
needs: [ stage1 ]
8078
continue-on-error: false
8179
strategy:
@@ -149,21 +147,20 @@ jobs:
149147
'generic-static',
150148
'bootstrapping-build'
151149
]
152-
machine: [ 'libcxx-self-hosted-linux' ]
150+
machine: [ 'llvm-premerge-libcxx-runners' ]
153151
include:
154152
- config: 'generic-cxx26'
155-
machine: libcxx-self-hosted-linux
153+
machine: llvm-premerge-libcxx-runners
156154
- config: 'generic-asan'
157-
machine: libcxx-self-hosted-linux
155+
machine: llvm-premerge-libcxx-runners
158156
- config: 'generic-tsan'
159-
machine: libcxx-self-hosted-linux
157+
machine: llvm-premerge-libcxx-runners
160158
- config: 'generic-ubsan'
161-
machine: libcxx-self-hosted-linux
159+
machine: llvm-premerge-libcxx-runners
162160
# Use a larger machine for MSAN to avoid timeout and memory allocation issues.
163161
- config: 'generic-msan'
164-
machine: libcxx-self-hosted-linux
162+
machine: llvm-premerge-libcxx-runners
165163
runs-on: ${{ matrix.machine }}
166-
container: ghcr.io/llvm/libcxx-linux-builder:2b57ebb50b6d418e70382e655feaa619b558e254
167164
steps:
168165
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
169166
- name: ${{ matrix.config }}

.github/workflows/libcxx-restart-preempted-jobs.yaml

Lines changed: 0 additions & 158 deletions
This file was deleted.

0 commit comments

Comments
 (0)