diff options
| -rwxr-xr-x | .ci/generate-buildkite-pipeline-premerge | 5 | ||||
| -rwxr-xr-x | .ci/monolithic-windows.sh | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge index c14ec46..4ebf304 100755 --- a/.ci/generate-buildkite-pipeline-premerge +++ b/.ci/generate-buildkite-pipeline-premerge @@ -233,10 +233,7 @@ linux_projects=$(add-dependencies ${linux_projects_to_test} | sort | uniq) windows_projects_to_test=$(exclude-windows $(compute-projects-to-test ${modified_projects})) windows_check_targets=$(check-targets ${windows_projects_to_test} | sort | uniq) -# Temporary disable the windows job. -# See https://discourse.llvm.org/t/rfc-future-of-windows-pre-commit-ci/76840 -#windows_projects=$(add-dependencies ${windows_projects_to_test} | sort | uniq) -windows_projects="" +windows_projects=$(add-dependencies ${windows_projects_to_test} | sort | uniq) # Generate the appropriate pipeline if [[ "${linux_projects}" != "" ]]; then diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh index a704e85..9561bf6 100755 --- a/.ci/monolithic-windows.sh +++ b/.ci/monolithic-windows.sh @@ -38,6 +38,12 @@ targets="${2}" echo "--- cmake" pip install -q -r ${MONOREPO_ROOT}/mlir/python/requirements.txt + +# The CMAKE_*_LINKER_FLAGS to disable the manifest come from research +# on fixing a build reliability issue on the build server, please +# see https://github.com/llvm/llvm-project/pull/82393 and +# https://discourse.llvm.org/t/rfc-future-of-windows-pre-commit-ci/76840/40 +# for further information. cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \ -D LLVM_ENABLE_PROJECTS="${projects}" \ -G Ninja \ @@ -49,7 +55,10 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \ -D COMPILER_RT_BUILD_ORC=OFF \ -D CMAKE_C_COMPILER_LAUNCHER=sccache \ -D CMAKE_CXX_COMPILER_LAUNCHER=sccache \ - -D MLIR_ENABLE_BINDINGS_PYTHON=ON + -D MLIR_ENABLE_BINDINGS_PYTHON=ON \ + -D CMAKE_EXE_LINKER_FLAGS="/MANIFEST:NO" \ + -D CMAKE_MODULE_LINKER_FLAGS="/MANIFEST:NO" \ + -D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO" echo "--- ninja" # Targets are not escaped as they are passed as separate arguments. |