[clang] Add a Windows build in the Clang pre-commit CI

This patch adds a CI job for Clang on Windows that is separate from the monolithic job that gets added automatically via the Phabricator integration with Buildkite. This way, we will retain the Windows testing for Clang when we move to GitHub Pull Requests. Differential Revision: https://reviews.llvm.org/D158995
llvm · Aug 30, 2023 · eb27be9 · eb27be9
1 parent 0a32a99
commit eb27be9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/clang/utils/ci/buildkite-pipeline.yml b/clang/utils/ci/buildkite-pipeline.yml
@@ -31,7 +31,7 @@ steps:
 
   - wait
 
-  - label: "Building and testing clang"
+  - label: "Building and testing clang (Linux)"
     commands:
       - "clang/utils/ci/run-buildbot build-clang"
     agents:
@@ -42,6 +42,18 @@ steps:
           limit: 2
     timeout_in_minutes: 120
 
+  - label: "Building and testing clang (Windows)"
+    commands:
+      - "C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64"
+      - "bash clang/utils/ci/run-buildbot build-clang-windows"
+    agents:
+      queue: "windows"
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
+    timeout_in_minutes: 120
+
   - wait
 
   - label: "Running libc++ test suite in C++03"

diff --git a/clang/utils/ci/run-buildbot b/clang/utils/ci/run-buildbot
@@ -95,6 +95,21 @@ build-clang)
 
     ninja -C ${BUILD_DIR} check-clang
 ;;
+build-clang-windows)
+    cmake -S llvm -B ${BUILD_DIR} -G Ninja                                      \
+        -D CMAKE_C_COMPILER_LAUNCHER=sccache                                    \
+        -D CMAKE_CXX_COMPILER_LAUNCHER=sccache                                  \
+        -D CMAKE_BUILD_TYPE=Release                                             \
+        -D CMAKE_INSTALL_PREFIX=install-windows                                 \
+        -D LLVM_ENABLE_PROJECTS="clang;compiler-rt"                             \
+        -D LLVM_ENABLE_ASSERTIONS=ON                                            \
+        -D LLVM_BUILD_EXAMPLES=ON                                               \
+        -D COMPILER_RT_BUILD_LIBFUZZER=OFF                                      \
+        -D COMPILER_RT_BUILD_ORC=OFF
+
+    ninja -C ${BUILD_DIR} install-clang install-clang-resource-headers
+    ninja -C ${BUILD_DIR} check-clang
+;;
 generic-cxx03)
     buildkite-agent artifact download install.tar.xz .
     tar -xvf install.tar.xz