Skip to content

Fix NSIS VIProductVersion for pre-release versions #3

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devnull03 merged 1 commit into from
Jun 7, 2026
Merged

Fix NSIS VIProductVersion for pre-release versions #3

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
8 changes: 8 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
outputs:
version: ${{ steps.v.outputs.version }}
tag: ${{ steps.v.outputs.tag }}
vi_version: ${{ steps.v.outputs.vi_version }}
steps:
- uses: actions/checkout@v4
- name: Derive and verify version
Expand All @@ -39,6 +40,12 @@ jobs:
fi
echo "version=$version" >> "$GITHUB_OUTPUT"
echo "tag=$tag" >> "$GITHUB_OUTPUT"
# NSIS VIProductVersion must be a strict numeric X.X.X.X. Strip any
# pre-release/build suffix (e.g. -alpha.1, +meta) and pad to 4 parts.
core="${version%%-*}"; core="${core%%+*}"
IFS=. read -r a b c d <<< "$core"
vi_version="${a:-0}.${b:-0}.${c:-0}.${d:-0}"
echo "vi_version=$vi_version" >> "$GITHUB_OUTPUT"

# ---------------------------------------------------------------------------
# macOS: universal (x86_64 + aarch64) binary -> .app -> .dmg
Expand Down Expand Up @@ -105,6 +112,7 @@ jobs:
$nsis = "C:\Program Files (x86)\NSIS\makensis.exe"
& $nsis `
"/DVERSION=$ver" `
"/DVIVERSION=${{ needs.version.outputs.vi_version }}" `
"/DSRCEXE=$PWD\dist\islandora-workbench.exe" `
"/DICONFILE=$PWD\assets\icons\app-icon.ico" `
"/DOUTFILE=$PWD\dist\Islandora-Workbench-$ver-setup.exe" `
Expand Down
7 changes: 6 additions & 1 deletion scripts/installer.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ Unicode true
!ifndef OUTFILE
!define OUTFILE "Islandora-Workbench-${VERSION}-setup.exe"
!endif
; VIProductVersion needs a strict numeric X.X.X.X. CI derives this from VERSION
; (stripping any pre-release suffix); the fallback covers local/manual compiles.
!ifndef VIVERSION
!define VIVERSION "0.0.0.0"
!endif

!define APPNAME "Islandora Workbench"
!define EXENAME "islandora-workbench.exe"
Expand Down Expand Up @@ -54,7 +59,7 @@ SetCompressor /SOLID lzma

!insertmacro MUI_LANGUAGE "English"

VIProductVersion "${VERSION}.0"
VIProductVersion "${VIVERSION}"
VIAddVersionKey "ProductName" "${APPNAME}"
VIAddVersionKey "CompanyName" "${COMPANY}"
VIAddVersionKey "FileDescription" "${APPNAME} Installer"
Expand Down
Loading