[libcxx] [llvm] [libc++] Use GitHub-provided runners for the windows CI (PR #79326)

Nikolas Klauser via llvm-commits llvm-commits at lists.llvm.org
Thu Jan 25 08:11:51 PST 2024


https://github.com/philnik777 updated https://github.com/llvm/llvm-project/pull/79326

>From 3445df87b1b30a9af7af787c7c6eaae46ea0dcc4 Mon Sep 17 00:00:00 2001
From: Nikolas Klauser <nikolasklauser at berlin.de>
Date: Wed, 24 Jan 2024 17:42:53 +0100
Subject: [PATCH] [libc++] Use GitHub-provided runners for the windows CI

---
 .github/workflows/libcxx-build-and-test.yaml | 21 +++++++++++++++++---
 libcxx/trigger                               |  0
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 libcxx/trigger

diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml
index 5727b956dc6dd2..4fa9ce3b9dc838 100644
--- a/.github/workflows/libcxx-build-and-test.yaml
+++ b/.github/workflows/libcxx-build-and-test.yaml
@@ -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 at v3
@@ -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 at v3
@@ -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 at v3
@@ -199,3 +199,18 @@ jobs:
             **/CMakeError.log
             **/CMakeOutput.log
             **/crash_diagnostics/*
+  windows:
+    runs-on: windows-2019
+    steps:
+      - uses: actions/checkout at 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
diff --git a/libcxx/trigger b/libcxx/trigger
new file mode 100644
index 00000000000000..e69de29bb2d1d6



More information about the llvm-commits mailing list