Skip to content

Commit 1dad575

Browse files
committed
Switch to wix and some debugging
1 parent f0aa10c commit 1dad575

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/release-binaries.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ jobs:
175175
echo "build-flang=$build_flang" >> $GITHUB_OUTPUT
176176
case "${{ inputs.runs-on }}" in
177177
ubuntu-22.04*|windows-2022)
178-
build_runs_on="depot-${{ inputs.runs-on }}-16"
178+
build_runs_on="depot-${{ inputs.runs-on }}-64"
179179
test_runs_on=$build_runs_on
180180
;;
181181
macos-13)
@@ -247,6 +247,9 @@ jobs:
247247
id: setup-stage
248248
uses: ./workflows-main/.github/workflows/release-binaries-setup-stage
249249

250+
- name: Install Wix
251+
run: |
252+
dotnet tool install --global wix
250253
- name: Configure
251254
id: build
252255
env:
@@ -276,6 +279,8 @@ jobs:
276279
-DBOOTSTRAP_BOOTSTRAP_CMAKE_NINJA_FORCE_RESPONSE_FILE=1 `
277280
-DBOOTSTRAP_CMAKE_OBJECT_PATH_MAX=500 `
278281
-DBOOTSTRAP_BOOTSTRAP_CMAKE_OBJECT_PATH_MAX=500 `
282+
-DBOOTSTRAP_BOOTSTRAP_LLVM_BUILD_TOOLS=OFF `
283+
-DBOOTSTRAP_BOOTSTRAP_CPACK_GENERATOR=WIX `
279284
-DBOOTSTRAP_BOOTSTRAP_CPACK_PACKAGE_FILE_NAME="${{ needs.prepare.outputs.release-binary-basename }}"
280285
281286
- name: Build Unix

clang/cmake/caches/Release.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ endfunction()
3232

3333
if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
3434
# Reduce projects built for Windows due to 2GB installer limits.
35-
set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra")
35+
#set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra")
36+
set (DEFAULT_PROJECTS "clang;lld")
3637
else()
3738
set (DEFAULT_PROJECTS "clang;lld;lldb;clang-tools-extra;polly;mlir;flang")
3839
endif()

0 commit comments

Comments
 (0)