Skip to content

Commit 3445df8

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

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
- name: ${{ matrix.config }}.${{ matrix.cxx }}
7373
run: libcxx/utils/ci/run-buildbot ${{ matrix.config }}
7474
env:
75-
CC: ${{ matrix.cc }}
75+
Cc ${{ matrix.cc }}
7676
CXX: ${{ matrix.cxx }}
7777
ENABLE_CLANG_TIDY: ${{ matrix.clang_tidy }}
7878
- uses: actions/upload-artifact@v3
@@ -121,7 +121,7 @@ jobs:
121121
- name: ${{ matrix.config }}
122122
run: libcxx/utils/ci/run-buildbot ${{ matrix.config }}
123123
env:
124-
CC: ${{ matrix.cc }}
124+
Cc ${{ matrix.cc }}
125125
CXX: ${{ matrix.cxx }}
126126
ENABLE_CLANG_TIDY: ${{ matrix.clang_tidy }}
127127
- uses: actions/upload-artifact@v3
@@ -186,7 +186,7 @@ jobs:
186186
- name: ${{ matrix.config }}
187187
run: libcxx/utils/ci/run-buildbot ${{ matrix.config }}
188188
env:
189-
CC: clang-18
189+
Cc clang-18
190190
CXX: clang++-18
191191
ENABLE_CLANG_TIDY: "OFF"
192192
- uses: actions/upload-artifact@v3
@@ -199,3 +199,18 @@ jobs:
199199
**/CMakeError.log
200200
**/CMakeOutput.log
201201
**/crash_diagnostics/*
202+
windows:
203+
runs-on: windows-2019
204+
steps:
205+
- uses: actions/checkout@v4
206+
- name: Install dependencies
207+
run: |
208+
choco install -y ninja wget
209+
wget https://github.com/mstorsjo/llvm-mingw/releases/download/20231128/llvm-mingw-20231128-ucrt-x86_64.zip -O llvm-mingw.zip
210+
powershell Expand-Archive llvm-mingw.zip -DestinationPath .
211+
del llvm-mingw.zip
212+
ren llvm-mingw-20231128-ucrt-x86_64 llvm-mingw
213+
- name: clang-cl (DLL)
214+
run: |
215+
cmd /k echo %path%
216+
bash PATH="$PATH:c/Program Files/Git/usr/bin:c/llvm-mingw/bin:c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/:c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/CommonExt ensions/Microsoft/TeamFoundation/Team Explorer:c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin:c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja:c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer:c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/CommonExtensions/Microsoft/TestWindow:c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/VC/VCPackages:c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/Tools/:c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/Tools/devinit:c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin:c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/bin/Roslyn:c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64:c/Program Files (x86)/Microsoft SDKs/Windows/v10.0A/bin/NETFX 4.8 Tools/x64/:c/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64:c/Program Files (x86)/Windows Kits/10/bin/x64:c/Windows/Microsoft.NET/Framework64/v4.0.30319" libcxx/utils/ci/run-buildbot clang-cl-dll

libcxx/trigger

Whitespace-only changes.

0 commit comments

Comments
 (0)