Skip to content

Commit bd942a4

Browse files
committed
[CIR][GitHub] More attempts to fix windows bots
1 parent ae2984b commit bd942a4

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.ci/monolithic-windows.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
6060
-D LLVM_ENABLE_PROJECTS="${projects}" \
6161
-G Ninja \
6262
-D CMAKE_BUILD_TYPE=Release \
63-
-D CLANG_ENABLE_CIR=${enable_cir} \
63+
-D CLANG_ENABLE_CIR="${enable_cir}" \
6464
-D LLVM_ENABLE_ASSERTIONS=ON \
6565
-D LLVM_BUILD_EXAMPLES=ON \
6666
-D COMPILER_RT_BUILD_LIBFUZZER=OFF \

.github/workflows/premerge.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ jobs:
105105
106106
echo "windows-projects=${projects_to_build}" >> $GITHUB_OUTPUT
107107
echo "windows-check-targets=${project_check_targets}" >> $GITHUB_OUTPUT
108+
echo "windows-clangir=${enable_cir}" >> $GITHUB_OUTPUT
108109
- name: Build and Test
109110
# Mark the job as a success even if the step fails so that people do
110111
# not get notified while the new premerge pipeline is in an
@@ -113,7 +114,7 @@ jobs:
113114
shell: cmd
114115
run: |
115116
call C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64
116-
bash .ci/monolithic-windows.sh "${{ steps.vars.outputs.windows-projects }}" "${{ steps.vars.outputs.windows-check-targets }}" "${enable_cir}"
117+
bash .ci/monolithic-windows.sh "${{ steps.vars.outputs.windows-projects }}" "${{ steps.vars.outputs.windows-check-targets }}" "${{ steps.vars.outputs.windows-clangir }}"
117118
- name: Upload Artifacts
118119
if: '!cancelled()'
119120
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0

0 commit comments

Comments
 (0)