Skip to content

Commit f006775

Browse files
test
1 parent bb9245a commit f006775

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

.ci/monolithic-windows.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ echo "--- cmake"
5050
pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
5151
pip install -q -r "${MONOREPO_ROOT}"/.ci/requirements.txt
5252

53+
export CC=cl
54+
export CXX=cl
55+
export LD=link
56+
5357
# The CMAKE_*_LINKER_FLAGS to disable the manifest come from research
5458
# on fixing a build reliability issue on the build server, please
5559
# see https://github.com/llvm/llvm-project/pull/82393 and
@@ -71,9 +75,7 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
7175
-D MLIR_ENABLE_BINDINGS_PYTHON=ON \
7276
-D CMAKE_EXE_LINKER_FLAGS="/MANIFEST:NO" \
7377
-D CMAKE_MODULE_LINKER_FLAGS="/MANIFEST:NO" \
74-
-D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO" \
75-
-D LLVM_PARALLEL_COMPILE_JOBS=16 \
76-
-D LLVM_PARALLEL_LINK_JOBS=4
78+
-D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO"
7779

7880
echo "--- ninja"
7981
# Targets are not escaped as they are passed as separate arguments.

.github/workflows/premerge.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
uses: hendrikmuhs/[email protected]
3131
with:
3232
variant: "sccache"
33-
- name: Build and Test
34-
continue-on-error: true
33+
- name: Compute Projects
34+
id: vars
3535
run: |
3636
modified_files=$(git diff --name-only HEAD~1...HEAD)
3737
modified_dirs=$(echo "$modified_files" | cut -d'/' -f1 | sort | uniq)
@@ -56,5 +56,12 @@ jobs:
5656
echo "Building projects: ${windows_projects}"
5757
echo "Running project checks targets: ${windows_check_targets}"
5858
59-
.ci/monolithic-windows.sh "$(echo ${windows_projects} | tr ' ' ';')" "$(echo ${windows_check_targets})"
60-
59+
#echo "windows-projects=${windows_projects}" >> $GITHUB_OUTPUT
60+
#echo "windows-check-targets=${windows_check_targets}" >> $GITHUB_OUTPUT
61+
echo "windows-projects=llvm" >> $GITHUB_OUTPUT
62+
echo "windows-check-targets=check-llvm" >> $GITHUB_OUTPUT
63+
- name: Build and Test
64+
shell: cmd
65+
run: |
66+
call C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64
67+
bash .ci/monolithic-windows.sh "llvm;clang" "check-llvm check-clang"

llvm/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# See docs/CMake.html for instructions about how to build LLVM with CMake.
2-
2+
# comment
33
cmake_minimum_required(VERSION 3.20.0)
44

55
include(CMakeDependentOption)

0 commit comments

Comments
 (0)