Skip to content

Commit 82afd9b

Browse files
philnik777mstorsjo
andauthored
[libc++] Use GitHub-provided runners for the windows CI (#79326)
Co-authored-by: Martin Storsjö <martin@martin.st>
1 parent e4afffb commit 82afd9b

File tree

4 files changed

+45
-50
lines changed

4 files changed

+45
-50
lines changed

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

+42
Original file line numberDiff line numberDiff line change
@@ -199,3 +199,45 @@ jobs:
199199
**/CMakeError.log
200200
**/CMakeOutput.log
201201
**/crash_diagnostics/*
202+
windows:
203+
runs-on: windows-2022
204+
needs: [ stage1 ]
205+
strategy:
206+
fail-fast: false
207+
matrix:
208+
include:
209+
- { config: clang-cl-dll, mingw: false }
210+
- { config: clang-cl-static, mingw: false }
211+
- { config: clang-cl-no-vcruntime, mingw: false }
212+
- { config: clang-cl-debug, mingw: false }
213+
- { config: clang-cl-static-crt, mingw: false }
214+
- { config: mingw-dll, mingw: true }
215+
- { config: mingw-static, mingw: true }
216+
- { config: mingw-dll-i686, mingw: true }
217+
steps:
218+
- uses: actions/checkout@v4
219+
- name: Install dependencies
220+
run: |
221+
choco install -y ninja wget
222+
pip install psutil
223+
- name: Install a current LLVM
224+
if: ${{ matrix.mingw != true }}
225+
run: |
226+
choco install -y llvm --version=17.0.6
227+
- name: Install llvm-mingw
228+
if: ${{ matrix.mingw == true }}
229+
run: |
230+
curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20231128/llvm-mingw-20231128-ucrt-x86_64.zip
231+
powershell Expand-Archive llvm-mingw*.zip -DestinationPath .
232+
del llvm-mingw*.zip
233+
mv llvm-mingw* c:\llvm-mingw
234+
echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
235+
- name: Add Git Bash to the path
236+
run: |
237+
echo "c:\Program Files\Git\usr\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
238+
- name: Set up the MSVC dev environment
239+
if: ${{ matrix.mingw != true }}
240+
uses: ilammy/msvc-dev-cmd@v1
241+
- name: Build and test
242+
run: |
243+
bash libcxx/utils/ci/run-buildbot ${{ matrix.config }}

libcxx/trigger

Whitespace-only changes.

libcxx/utils/ci/buildkite-pipeline.yml

-50
Original file line numberDiff line numberDiff line change
@@ -57,56 +57,6 @@ environment_definitions:
5757

5858

5959
steps:
60-
- group: ':windows: Windows'
61-
steps:
62-
- label: Clang-cl (DLL)
63-
command: bash libcxx/utils/ci/run-buildbot clang-cl-dll
64-
agents:
65-
queue: windows
66-
<<: *common
67-
68-
- label: Clang-cl (Static)
69-
command: bash libcxx/utils/ci/run-buildbot clang-cl-static
70-
agents:
71-
queue: windows
72-
<<: *common
73-
74-
- label: Clang-cl (no vcruntime exceptions)
75-
command: bash libcxx/utils/ci/run-buildbot clang-cl-no-vcruntime
76-
<<: *common
77-
agents:
78-
queue: windows
79-
80-
- label: Clang-cl (Debug mode)
81-
command: bash libcxx/utils/ci/run-buildbot clang-cl-debug
82-
agents:
83-
queue: windows
84-
<<: *common
85-
86-
- label: Clang-cl (Static CRT)
87-
command: bash libcxx/utils/ci/run-buildbot clang-cl-static-crt
88-
agents:
89-
queue: windows
90-
<<: *common
91-
92-
- label: MinGW (DLL, x86_64)
93-
command: bash libcxx/utils/ci/run-buildbot mingw-dll
94-
agents:
95-
queue: windows
96-
<<: *common
97-
98-
- label: MinGW (Static, x86_64)
99-
command: bash libcxx/utils/ci/run-buildbot mingw-static
100-
agents:
101-
queue: windows
102-
<<: *common
103-
104-
- label: MinGW (DLL, i686)
105-
command: bash libcxx/utils/ci/run-buildbot mingw-dll-i686
106-
agents:
107-
queue: windows
108-
<<: *common
109-
11060
- group: ':mac: Apple'
11161
steps:
11262
- label: MacOS x86_64

runtimes/CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ set(LLVM_COMPILER_CHECKED ON)
155155
include(AddLLVM)
156156
include(HandleLLVMOptions)
157157

158+
# Loot at the PATH first to avoid a version mismatch between the command-line
159+
# python and the CMake-found version
160+
set(Python3_FIND_REGISTRY LAST)
158161
find_package(Python3 REQUIRED COMPONENTS Interpreter)
159162

160163
# Host triple is used by tests to check if they are running natively.

0 commit comments

Comments
 (0)