Skip to content

Commit

Permalink
[libc++] Use GitHub-provided runners for the windows CI
Browse files Browse the repository at this point in the history
  • Loading branch information
philnik777 committed Jan 25, 2024
1 parent 4079aab commit 3445df8
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions .github/workflows/libcxx-build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: ${{ matrix.config }}.${{ matrix.cxx }}
run: libcxx/utils/ci/run-buildbot ${{ matrix.config }}
env:
CC: ${{ matrix.cc }}
Cc ${{ matrix.cc }}
CXX: ${{ matrix.cxx }}
ENABLE_CLANG_TIDY: ${{ matrix.clang_tidy }}
- uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
- name: ${{ matrix.config }}
run: libcxx/utils/ci/run-buildbot ${{ matrix.config }}
env:
CC: ${{ matrix.cc }}
Cc ${{ matrix.cc }}
CXX: ${{ matrix.cxx }}
ENABLE_CLANG_TIDY: ${{ matrix.clang_tidy }}
- uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
- name: ${{ matrix.config }}
run: libcxx/utils/ci/run-buildbot ${{ matrix.config }}
env:
CC: clang-18
Cc clang-18
CXX: clang++-18
ENABLE_CLANG_TIDY: "OFF"
- uses: actions/upload-artifact@v3
Expand All @@ -199,3 +199,18 @@ jobs:
**/CMakeError.log
**/CMakeOutput.log
**/crash_diagnostics/*
windows:
runs-on: windows-2019
steps:
- uses: actions/checkout@v4
- name: Install dependencies
run: |
choco install -y ninja wget
wget https://github.com/mstorsjo/llvm-mingw/releases/download/20231128/llvm-mingw-20231128-ucrt-x86_64.zip -O llvm-mingw.zip
powershell Expand-Archive llvm-mingw.zip -DestinationPath .
del llvm-mingw.zip
ren llvm-mingw-20231128-ucrt-x86_64 llvm-mingw
- name: clang-cl (DLL)
run: |
cmd /k echo %path%
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
Empty file added libcxx/trigger
Empty file.

0 comments on commit 3445df8

Please sign in to comment.