4949jobs :
5050 stage1 :
5151 if : github.repository_owner == 'llvm'
52- runs-on : libcxx-runners-8-set
52+ runs-on : libcxx-runners-set
53+ container : ghcr.io/libcxx/actions-builder:testing-2024-09-21
5354 continue-on-error : false
5455 strategy :
5556 fail-fast : false
@@ -79,12 +80,14 @@ jobs:
7980 path : |
8081 **/test-results.xml
8182 **/*.abilist
83+ **/CMakeConfigureLog.yaml
8284 **/CMakeError.log
8385 **/CMakeOutput.log
8486 **/crash_diagnostics/*
8587 stage2 :
8688 if : github.repository_owner == 'llvm'
87- runs-on : libcxx-runners-8-set
89+ runs-on : libcxx-runners-set
90+ container : ghcr.io/libcxx/actions-builder:testing-2024-09-21
8891 needs : [ stage1 ]
8992 continue-on-error : false
9093 strategy :
@@ -123,6 +126,7 @@ jobs:
123126 path : |
124127 **/test-results.xml
125128 **/*.abilist
129+ **/CMakeConfigureLog.yaml
126130 **/CMakeError.log
127131 **/CMakeOutput.log
128132 **/crash_diagnostics/*
@@ -155,25 +159,23 @@ jobs:
155159 ' generic-no-rtti' ,
156160 ' generic-optimized-speed' ,
157161 ' generic-static' ,
158- # TODO Find a better place for the benchmark and bootstrapping builds to live. They're either very expensive
159- # or don't provide much value since the benchmark run results are too noise on the bots.
160- ' benchmarks' ,
161162 ' bootstrapping-build'
162163 ]
163- machine : [ 'libcxx-runners-8- set' ]
164+ machine : [ 'libcxx-runners-set' ]
164165 include :
165166 - config : ' generic-cxx26'
166- machine : libcxx-runners-8- set
167+ machine : libcxx-runners-set
167168 - config : ' generic-asan'
168- machine : libcxx-runners-8- set
169+ machine : libcxx-runners-set
169170 - config : ' generic-tsan'
170- machine : libcxx-runners-8- set
171+ machine : libcxx-runners-set
171172 - config : ' generic-ubsan'
172- machine : libcxx-runners-8- set
173+ machine : libcxx-runners-set
173174 # Use a larger machine for MSAN to avoid timeout and memory allocation issues.
174175 - config : ' generic-msan'
175- machine : libcxx-runners-8- set
176+ machine : libcxx-runners-set
176177 runs-on : ${{ matrix.machine }}
178+ container : ghcr.io/libcxx/actions-builder:testing-2024-09-21
177179 steps :
178180 - uses : actions/checkout@v4
179181 - name : ${{ matrix.config }}
@@ -188,22 +190,30 @@ jobs:
188190 path : |
189191 **/test-results.xml
190192 **/*.abilist
193+ **/CMakeConfigureLog.yaml
191194 **/CMakeError.log
192195 **/CMakeOutput.log
193196 **/crash_diagnostics/*
194197
195198 macos :
196- runs-on : macos-14
197199 needs : [ stage1 ]
198200 strategy :
199- fail-fast : true
201+ fail-fast : false
200202 matrix :
201- config : [
202- generic-cxx03,
203- generic-cxx23,
204- generic-modules,
205- apple-configuration
206- ]
203+ include :
204+ - config : generic-cxx03
205+ os : macos-latest
206+ - config : generic-cxx23
207+ os : macos-latest
208+ - config : generic-modules
209+ os : macos-latest
210+ - config : apple-configuration
211+ os : macos-latest
212+ - config : apple-system
213+ os : macos-13
214+ - config : apple-system-hardened
215+ os : macos-13
216+ runs-on : ${{ matrix.os }}
207217 steps :
208218 - uses : actions/checkout@v4
209219 - uses : maxim-lobanov/setup-xcode@v1
@@ -223,6 +233,7 @@ jobs:
223233 path : |
224234 **/test-results.xml
225235 **/*.abilist
236+ **/CMakeConfigureLog.yaml
226237 **/CMakeError.log
227238 **/CMakeOutput.log
228239 **/crash_diagnostics/*
@@ -242,6 +253,7 @@ jobs:
242253 - { config: mingw-dll, mingw: true }
243254 - { config: mingw-static, mingw: true }
244255 - { config: mingw-dll-i686, mingw: true }
256+ - { config: mingw-incomplete-sysroot, mingw: true }
245257 steps :
246258 - uses : actions/checkout@v4
247259 - name : Install dependencies
@@ -260,6 +272,12 @@ jobs:
260272 del llvm-mingw*.zip
261273 mv llvm-mingw* c:\llvm-mingw
262274 echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
275+ - name : Simulate a from-scratch build of llvm-mingw
276+ if : ${{ matrix.config == 'mingw-incomplete-sysroot' }}
277+ run : |
278+ rm -r c:\llvm-mingw\include\c++
279+ rm -r c:\llvm-mingw\*-w64-mingw32\lib\libc++*
280+ rm -r c:\llvm-mingw\*-w64-mingw32\lib\libunwind*
263281 - name : Add Git Bash to the path
264282 run : |
265283 echo "c:\Program Files\Git\usr\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
0 commit comments