Skip to content

Commit 72fe3e2

Browse files
committed
ci: use absolute paths for ISCC and restore app manifest (v6.0.0.7)
1 parent 8a5db66 commit 72fe3e2

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

.github/workflows/build-release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
$archUpper = if ("${{ matrix.platform }}" -eq "x64") { "X64" } else { "ARM64" }
6363
6464
# Path for CMake build artifact (Ninja puts it in root)
65-
$exePath = "out/build/${{ matrix.preset }}/QuickView.exe"
65+
$exePath = "${{ github.workspace }}/out/build/${{ matrix.preset }}/QuickView.exe"
6666
if (-not (Test-Path $exePath)) { Write-Error "EXE not found at $exePath"; exit 1 }
6767
6868
# Extract version
@@ -89,9 +89,10 @@ jobs:
8989
$tag = "${{ env.DETECTED_TAG }}"
9090
$version = $tag.TrimStart('v')
9191
92-
# Invoke ISCC with correct ExePath
92+
# CRITICAL FIX: Use absolute path for ExePath to prevent Inno Setup relative path confusion
93+
$absExePath = "${{ github.workspace }}/out/build/${{ matrix.preset }}/QuickView.exe"
9394
$outputName = "QuickView_Installer_${tag}_${archUpper}"
94-
& "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" /DMyAppVersion=$version /DAppArch=$arch /DOutputName=$outputName /DExePath="out/build/${{ matrix.preset }}/QuickView.exe" /O"Release\dist" installer\QuickView.iss
95+
& "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" /DMyAppVersion=$version /DAppArch=$arch /DOutputName=$outputName /DExePath="$absExePath" /O"Release\dist" installer\QuickView.iss
9596
9697
- name: Upload Build Artifacts
9798
uses: actions/upload-artifact@v4

QuickView/QuickView.rc

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
// Version Information - This sets the display name in Windows
1212
VS_VERSION_INFO VERSIONINFO
13-
FILEVERSION 6,0,0,6
14-
PRODUCTVERSION 6,0,0,6
13+
FILEVERSION 6,0,0,7
14+
PRODUCTVERSION 6,0,0,7
1515
FILEFLAGSMASK 0x3fL
1616
FILEFLAGS 0x0L
1717
FILEOS VOS_NT_WINDOWS32
@@ -24,11 +24,11 @@ BEGIN
2424
BEGIN
2525
VALUE "CompanyName", "QuickView"
2626
VALUE "FileDescription", "QuickView"
27-
VALUE "FileVersion", "6.0.0.6"
27+
VALUE "FileVersion", "6.0.0.7"
2828
VALUE "InternalName", "QuickView"
2929
VALUE "OriginalFilename", "QuickView.exe"
3030
VALUE "ProductName", "QuickView"
31-
VALUE "ProductVersion", "6.0.0.6"
31+
VALUE "ProductVersion", "6.0.0.7"
3232
END
3333
END
3434
BLOCK "VarFileInfo"
@@ -37,9 +37,14 @@ BEGIN
3737
END
3838
END
3939

40-
// ============================================================================
41-
// ICC Profiles - Compact V4
42-
// ============================================================================
40+
// Cursor
41+
IDC_CURSOR_ZOOM_IN CURSOR "Cursor\\zoom_in.cur"
42+
IDC_CURSOR_ZOOM_OUT CURSOR "Cursor\\zoom_out.cur"
43+
IDC_CURSOR_GRAB CURSOR "Cursor\\grab.cur"
44+
IDC_CURSOR_GRABBING CURSOR "Cursor\\grabbing.cur"
45+
46+
// ICC Profiles
47+
IDR_ICC_SRGB ICC "ICC\\sRGB_v4_ICC_preference.icc"
4348
IDR_ICC_P3 ICC "ICC\\DisplayP3.icc"
4449
IDR_ICC_ADOBERGB ICC "ICC\\AdobeRGB.icc"
4550
IDR_ICC_PROPHOTO ICC "ICC\\ProPhoto.icc"

0 commit comments

Comments
 (0)