[llvm] repair and re-enable Windows buildkite presubmit (PR #82393)
Lucile Rose Nihlen via llvm-commits
llvm-commits at lists.llvm.org
Tue Feb 20 12:27:53 PST 2024
https://github.com/lnihlen updated https://github.com/llvm/llvm-project/pull/82393
>From 550ba12754272f7646857d66babd357dd4cef338 Mon Sep 17 00:00:00 2001
From: Lucile Nihlen <luci.the.rose at gmail.com>
Date: Tue, 20 Feb 2024 14:36:06 +0000
Subject: [PATCH 1/6] re-enable the windows build for testing
---
.ci/generate-buildkite-pipeline-premerge | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge
index c14ec464a43a66..3ba402524f7f46 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -235,8 +235,8 @@ windows_projects_to_test=$(exclude-windows $(compute-projects-to-test ${modified
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)
+#windows_projects=""
# Generate the appropriate pipeline
if [[ "${linux_projects}" != "" ]]; then
>From a17df951c6a41fb7df20e2a4e62ab24ba3510dbd Mon Sep 17 00:00:00 2001
From: Lucile Nihlen <luci.the.rose at gmail.com>
Date: Tue, 20 Feb 2024 18:11:50 +0000
Subject: [PATCH 2/6] force-enable windows presubmit
---
.ci/generate-buildkite-pipeline-premerge | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge
index 3ba402524f7f46..a4b065c85bb88a 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -235,8 +235,10 @@ windows_projects_to_test=$(exclude-windows $(compute-projects-to-test ${modified
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)
+
+windows_projects="llvm"
+windows_check_targets="check-all"
# Generate the appropriate pipeline
if [[ "${linux_projects}" != "" ]]; then
>From 216c8ec79a7ff463522b131a337d5d04f5d4f16d Mon Sep 17 00:00:00 2001
From: Lucile Nihlen <luci.the.rose at gmail.com>
Date: Tue, 20 Feb 2024 18:25:10 +0000
Subject: [PATCH 3/6] try disabling manifests
---
.ci/monolithic-windows.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh
index a704e855f011cb..2e204cdc98e472 100755
--- a/.ci/monolithic-windows.sh
+++ b/.ci/monolithic-windows.sh
@@ -49,7 +49,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.
>From c5ca3d2c033e48e965dc29e682955fc7091e20d2 Mon Sep 17 00:00:00 2001
From: Lucile Nihlen <luci.the.rose at gmail.com>
Date: Tue, 20 Feb 2024 18:35:56 +0000
Subject: [PATCH 4/6] try upper-case
---
.ci/monolithic-windows.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh
index 2e204cdc98e472..add3ca8ee1fc2c 100755
--- a/.ci/monolithic-windows.sh
+++ b/.ci/monolithic-windows.sh
@@ -50,9 +50,9 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
-D CMAKE_C_COMPILER_LAUNCHER=sccache \
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
-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"
+ -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.
>From 6e9b00a9825302c3aeef691df04aa58df8412046 Mon Sep 17 00:00:00 2001
From: Lucile Nihlen <luci.the.rose at gmail.com>
Date: Tue, 20 Feb 2024 18:57:24 +0000
Subject: [PATCH 5/6] re-enable windows builds
---
.ci/generate-buildkite-pipeline-premerge | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge
index a4b065c85bb88a..4ebf304e23d587 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -233,12 +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="llvm"
-windows_check_targets="check-all"
+windows_projects=$(add-dependencies ${windows_projects_to_test} | sort | uniq)
# Generate the appropriate pipeline
if [[ "${linux_projects}" != "" ]]; then
>From 77ebc893bcedec92d6d39ae53c30cdece5cde60b Mon Sep 17 00:00:00 2001
From: Lucile Nihlen <luci.the.rose at gmail.com>
Date: Tue, 20 Feb 2024 20:27:33 +0000
Subject: [PATCH 6/6] add comment
---
.ci/monolithic-windows.sh | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh
index add3ca8ee1fc2c..9561bf668a90cb 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 \
More information about the llvm-commits
mailing list