Skip to content

Commit 22b8013

Browse files
committed
[libc++][WIP] Move to Github hosted builders
Libc++ experiences periodic outages of our Github actions builders, which are quite disruptive. Unfortunately, the Github self-hosted runner setup is very opaque. It works extremely well when it works, but most contributors are unable to troubleshoot issues related to the setup when they happen. This patch attempts to move the libc++ builders to normal Github hosted runners. This is primarily to evaluate the feasibility of such a change, which would simplify our CI setup but may not scale sufficiently for our needs.
1 parent ef44e46 commit 22b8013

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,13 @@ env:
4949
jobs:
5050
stage1:
5151
if: github.repository_owner == 'llvm'
52-
runs-on: libcxx-runners-8-set
52+
runs: &docker-image
53+
using: 'docker'
54+
image: 'libcxx/utils/ci/Dockerfile'
55+
args:
56+
- BASE_IMAGE: ghcr.io/actions/actions-runner:2.317.0
57+
- GCC_LATEST_VERSION: 14
58+
- LLVM_HEAD_VERSION: 20
5359
continue-on-error: false
5460
strategy:
5561
fail-fast: false
@@ -84,7 +90,8 @@ jobs:
8490
**/crash_diagnostics/*
8591
stage2:
8692
if: github.repository_owner == 'llvm'
87-
runs-on: libcxx-runners-8-set
93+
runs:
94+
<<: *docker-image
8895
needs: [ stage1 ]
8996
continue-on-error: false
9097
strategy:
@@ -136,12 +143,15 @@ jobs:
136143
matrix:
137144
config: [
138145
'generic-abi-unstable',
146+
'generic-asan',
147+
'generic-cxx26',
139148
'generic-hardening-mode-debug',
140149
'generic-hardening-mode-extensive',
141150
'generic-hardening-mode-fast',
142151
'generic-hardening-mode-fast-with-abi-breaks',
143152
'generic-merged',
144153
'generic-modules-lsv',
154+
'generic-msan',
145155
'generic-no-exceptions',
146156
'generic-no-experimental',
147157
'generic-no-filesystem',
@@ -155,25 +165,15 @@ jobs:
155165
'generic-no-rtti',
156166
'generic-optimized-speed',
157167
'generic-static',
168+
'generic-tsan',
169+
'generic-ubsan',
158170
# TODO Find a better place for the benchmark and bootstrapping builds to live. They're either very expensive
159171
# or don't provide much value since the benchmark run results are too noise on the bots.
160172
'benchmarks',
161173
'bootstrapping-build'
162174
]
163-
machine: [ 'libcxx-runners-8-set' ]
164-
include:
165-
- config: 'generic-cxx26'
166-
machine: libcxx-runners-8-set
167-
- config: 'generic-asan'
168-
machine: libcxx-runners-8-set
169-
- config: 'generic-tsan'
170-
machine: libcxx-runners-8-set
171-
- config: 'generic-ubsan'
172-
machine: libcxx-runners-8-set
173-
# Use a larger machine for MSAN to avoid timeout and memory allocation issues.
174-
- config: 'generic-msan'
175-
machine: libcxx-runners-8-set
176-
runs-on: ${{ matrix.machine }}
175+
runs:
176+
<<: *docker-image
177177
steps:
178178
- uses: actions/checkout@v4
179179
- name: ${{ matrix.config }}

0 commit comments

Comments
 (0)