ldionne created this revision.
Herald added a project: All.
ldionne requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

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.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D158995

Files:
  clang/utils/ci/buildkite-pipeline.yml
  clang/utils/ci/run-buildbot


Index: clang/utils/ci/run-buildbot
===================================================================
--- clang/utils/ci/run-buildbot
+++ clang/utils/ci/run-buildbot
@@ -95,6 +95,25 @@
 
     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
+    ccache -s
+    tar -cJvf install-windows.tar.xz install-windows/
+    buildkite-agent artifact upload --debug install-windows.tar.xz
+
+    ninja -C ${BUILD_DIR} check-clang
+;;
 generic-cxx03)
     buildkite-agent artifact download install.tar.xz .
     tar -xvf install.tar.xz
Index: clang/utils/ci/buildkite-pipeline.yml
===================================================================
--- clang/utils/ci/buildkite-pipeline.yml
+++ clang/utils/ci/buildkite-pipeline.yml
@@ -31,7 +31,7 @@
 
   - wait
 
-  - label: "Building and testing clang"
+  - label: "Building and testing clang (Linux)"
     commands:
       - "clang/utils/ci/run-buildbot build-clang"
     agents:
@@ -42,6 +42,17 @@
           limit: 2
     timeout_in_minutes: 120
 
+  - label: "Building and testing clang (Windows)"
+    commands:
+      - "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"


Index: clang/utils/ci/run-buildbot
===================================================================
--- clang/utils/ci/run-buildbot
+++ clang/utils/ci/run-buildbot
@@ -95,6 +95,25 @@
 
     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
+    ccache -s
+    tar -cJvf install-windows.tar.xz install-windows/
+    buildkite-agent artifact upload --debug install-windows.tar.xz
+
+    ninja -C ${BUILD_DIR} check-clang
+;;
 generic-cxx03)
     buildkite-agent artifact download install.tar.xz .
     tar -xvf install.tar.xz
Index: clang/utils/ci/buildkite-pipeline.yml
===================================================================
--- clang/utils/ci/buildkite-pipeline.yml
+++ clang/utils/ci/buildkite-pipeline.yml
@@ -31,7 +31,7 @@
 
   - wait
 
-  - label: "Building and testing clang"
+  - label: "Building and testing clang (Linux)"
     commands:
       - "clang/utils/ci/run-buildbot build-clang"
     agents:
@@ -42,6 +42,17 @@
           limit: 2
     timeout_in_minutes: 120
 
+  - label: "Building and testing clang (Windows)"
+    commands:
+      - "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"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to