File tree Expand file tree Collapse file tree 4 files changed +18
-8
lines changed Expand file tree Collapse file tree 4 files changed +18
-8
lines changed Original file line number Diff line number Diff line change 9898
9999EXCLUDE_WINDOWS = {
100100 "cross-project-tests" , # TODO(issues/132797): Tests are failing.
101- "compiler-rt" , # TODO(issues/132798): Tests take excessive time.
102101 "openmp" , # TODO(issues/132799): Does not detect perl installation.
103102 "libc" , # No Windows Support.
104103 "lldb" , # TODO(issues/132800): Needs environment setup.
Original file line number Diff line number Diff line change @@ -110,15 +110,15 @@ def test_clang_windows(self):
110110 ["clang/CMakeLists.txt" ], "Windows"
111111 )
112112 self .assertEqual (
113- env_variables ["projects_to_build" ], "clang;clang-tools-extra;llvm"
113+ env_variables ["projects_to_build" ], "clang;clang-tools-extra;lld; llvm"
114114 )
115115 self .assertEqual (
116116 env_variables ["project_check_targets" ], "check-clang check-clang-tools"
117117 )
118- self .assertEqual (env_variables ["runtimes_to_build" ], "" )
118+ self .assertEqual (env_variables ["runtimes_to_build" ], "compiler-rt " )
119119 self .assertEqual (
120120 env_variables ["runtimes_check_targets" ],
121- "" ,
121+ "check-compiler-rt " ,
122122 )
123123 self .assertEqual (
124124 env_variables ["runtimes_check_targets_needs_reconfig" ],
@@ -318,11 +318,11 @@ def test_windows_ci(self):
318318 )
319319 self .assertEqual (
320320 env_variables ["runtimes_to_build" ],
321- "" ,
321+ "compiler-rt " ,
322322 )
323323 self .assertEqual (
324324 env_variables ["runtimes_check_targets" ],
325- "" ,
325+ "check-compiler-rt " ,
326326 )
327327 self .assertEqual (
328328 env_variables ["runtimes_check_targets_needs_reconfig" ],
Original file line number Diff line number Diff line change @@ -17,6 +17,8 @@ source .ci/utils.sh
1717
1818projects=" ${1} "
1919targets=" ${2} "
20+ runtimes=" ${3} "
21+ runtimes_targets=" ${4} "
2022
2123start-group " CMake"
2224pip install -q -r " ${MONOREPO_ROOT} " /.ci/all_requirements.txt
@@ -46,9 +48,14 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
4648 -D MLIR_ENABLE_BINDINGS_PYTHON=ON \
4749 -D CMAKE_EXE_LINKER_FLAGS=" /MANIFEST:NO" \
4850 -D CMAKE_MODULE_LINKER_FLAGS=" /MANIFEST:NO" \
49- -D CMAKE_SHARED_LINKER_FLAGS=" /MANIFEST:NO"
51+ -D CMAKE_SHARED_LINKER_FLAGS=" /MANIFEST:NO" \
52+ -D LLVM_ENABLE_RUNTIMES=" ${runtimes} "
5053
5154start-group " ninja"
5255
5356# Targets are not escaped as they are passed as separate arguments.
5457ninja -C " ${BUILD_DIR} " -k 0 ${targets} | & tee ninja.log
58+
59+ start-group " ninja runtimes"
60+
61+ ninja -C " ${BUILD_DIR} " -k 0 ${runtimes_targets} | & tee ninja_runtimes.log
Original file line number Diff line number Diff line change @@ -108,17 +108,21 @@ jobs:
108108
109109 echo "Building projects: ${projects_to_build}"
110110 echo "Running project checks targets: ${project_check_targets}"
111+ echo "Building runtimes: ${runtimes_to_build}"
112+ echo "Running runtimes checks targets: ${runtimes_check_targets}"
111113
112114 echo "windows-projects=${projects_to_build}" >> $GITHUB_OUTPUT
113115 echo "windows-check-targets=${project_check_targets}" >> $GITHUB_OUTPUT
116+ echo "windows-runtimes=${runtimes_to_build}" >> $GITHUB_OUTPUT
117+ echo "windows-runtimes-check-targets=${runtimes_check_targets}" >> $GITHUB_OUTPUT
114118 - name : Build and Test
115119 if : ${{ steps.vars.outputs.windows-projects != '' }}
116120 shell : cmd
117121 run : |
118122 call C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64
119123 # See the comments above in the Linux job for why we define each of
120124 # these environment variables.
121- bash -c "export SCCACHE_GCS_BUCKET=$CACHE_GCS_BUCKET; export SCCACHE_GCS_RW_MODE=READ_WRITE; export SCCACHE_IDLE_TIMEOUT=0; mkdir artifacts; SCCACHE_LOG=info SCCACHE_ERROR_LOG=$(pwd)/artifacts/sccache.log sccache --start-server; .ci/monolithic-windows.sh \"${{ steps.vars.outputs.windows-projects }}\" \"${{ steps.vars.outputs.windows-check-targets }}\""
125+ bash -c "export SCCACHE_GCS_BUCKET=$CACHE_GCS_BUCKET; export SCCACHE_GCS_RW_MODE=READ_WRITE; export SCCACHE_IDLE_TIMEOUT=0; mkdir artifacts; SCCACHE_LOG=info SCCACHE_ERROR_LOG=$(pwd)/artifacts/sccache.log sccache --start-server; .ci/monolithic-windows.sh \"${{ steps.vars.outputs.windows-projects }}\" \"${{ steps.vars.outputs.windows-check-targets }}\" \"${{ steps.vars.outputs.windows-runtimes }}\" \"${{ steps.vars.outputs.windows-runtimes-check-targets }}\" "
122126 - name : Upload Artifacts
123127 # In some cases, Github will fail to upload the artifact. We want to
124128 # continue anyways as a failed artifact upload is an infra failure, not
You can’t perform that action at this time.
0 commit comments