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

fix(nsis): release builds #1287

Merged
merged 3 commits into from
Dec 18, 2024
Merged

fix(nsis): release builds #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b3a489
fix(nsis): release builds
GeopJr Dec 18, 2024
d59ed8c
fix: remove double nsis building
GeopJr Dec 18, 2024
f796610
fix(ci): concurrency inputs getting ignored
GeopJr Dec 18, 2024
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
7 changes: 3 additions & 4 deletions .github/workflows/msys2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
release:
type: boolean
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.release }}
cancel-in-progress: true
name: Windows
jobs:
Expand All @@ -27,15 +27,14 @@ jobs:
msystem: mingw64
update: true
install: git make zip wget unzip mingw-w64-x86_64-meson mingw-w64-x86_64-gcc mingw-w64-x86_64-vala mingw-w64-x86_64-libsoup3 mingw-w64-x86_64-libxml2 mingw-w64-x86_64-gtksourceview5 mingw-w64-x86_64-webp-pixbuf-loader mingw-w64-x86_64-libadwaita mingw-w64-x86_64-libgee mingw-w64-x86_64-json-glib mingw-w64-x86_64-libsecret mingw-w64-x86_64-desktop-file-utils mingw-w64-x86_64-imagemagick mingw-w64-x86_64-icu mingw-w64-x86_64-libspelling mingw-w64-x86_64-gstreamer mingw-w64-x86_64-gst-plugins-base mingw-w64-x86_64-gst-plugins-good mingw-w64-x86_64-nsis
- run: make windows release=1
- run: make windows windows_nsis release=1
if: ${{ inputs.release }}
- run: make windows
- run: make windows windows_nsis
if: ${{ !inputs.release }}
- uses: actions/upload-artifact@v4
with:
name: tuba_windows_portable
path: tuba_windows_portable/
- run: make windows_nsis
- uses: actions/upload-artifact@v4
with:
name: Tuba Setup.exe
Expand Down
1 change: 1 addition & 0 deletions build-aux/dev.geopjr.Tuba.nsi.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
File "${EXEC_NAME}.ico"
WriteRegStr HKCU "Software\${NAME}" "" $INSTDIR

DeleteRegKey HKLM "${UNINSTALL_KEY}"
WriteRegStr HKLM "${UNINSTALL_KEY}" "DisplayName" "${NAME}"
WriteRegStr HKLM "${UNINSTALL_KEY}" "UninstallString" "$INSTDIR\uninstall.exe"
WriteRegStr HKLM "${UNINSTALL_KEY}" "InstallLocation" "$INSTDIR"
Expand Down
Loading