Skip to content

Commit 0439ebc

Browse files
committed
[libc++] Use GitHub-provided runners for the windows CI
1 parent 4079aab commit 0439ebc

File tree

4 files changed

+44
-50
lines changed

4 files changed

+44
-50
lines changed

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

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

libcxx/trigger

Whitespace-only changes.

libcxx/utils/ci/buildkite-pipeline.yml

Lines changed: 0 additions & 50 deletions
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

Lines changed: 3 additions & 0 deletions
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)