Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build using fixed WIX extension version #88

Merged
merged 1 commit into from
Mar 20, 2024
Merged

Fix build using fixed WIX extension version #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Archive artifacts
uses: actions/upload-artifact@v4
with:
name: pkg
name: macOS
path: build/*.pkg
windows:
name: Build on Windows
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: 6.6.1
version: 6.6.2
arch: win64_msvc2019_64
- name: Setup dev env
uses: ilammy/msvc-dev-cmd@v1
Expand All @@ -60,14 +60,14 @@ jobs:
- name: Install WiX
run: |
dotnet tool install --global wix
wix extension -g add WixToolset.UI.wixext
wix extension -g add WixToolset.UI.wixext/4.0.4
- name: Build
run: |
cmake -S . -B build `
-DCMAKE_TOOLCHAIN_FILE=${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake
cmake --build build --target installer
- name: Archive artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: msi
name: msi_${{ matrix.vcver }}_x64
path: build/*.msi
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 2 files
+10 −10 .github/workflows/build.yml
+3 −6 Configuration.cpp