diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ec08dbc0..645042f7 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -77,5 +77,5 @@ jobs: uses: actions/upload-artifact@v4 with: name: welle.io AppImage - path: ./welle*.AppImage + path: ./*welle-io-x86_64.AppImage if-no-files-found: error diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 214af0b4..af9779fa 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -71,7 +71,10 @@ jobs: $Filename = $current_date + "_" + $git_hash + "_Windows_welle-io-setup_x64" # Run InnoSetup - & "ISCC" "/F..\$Filename" "windows/installer.iss" + & ISCC /O..\ /F$Filename windows/installer.iss + + # Copy installer () + cp - name: Archive artifacts (welle.io Windows installer) if: always() && steps.create_installer.outcome == 'success' diff --git a/windows/installer.iss b/windows/installer.iss index b4cedc44..4be92d51 100644 --- a/windows/installer.iss +++ b/windows/installer.iss @@ -16,13 +16,14 @@ UninstallDisplayIcon={app}\welle-io.exe Compression=lzma2 SolidCompression=yes OutputDir=. -; "ArchitecturesAllowed=x64" specifies that Setup cannot run on -; anything but x64. -ArchitecturesAllowed=x64 -; "ArchitecturesInstallIn64BitMode=x64" requests that the install be -; done in "64-bit mode" on x64, meaning it should use the native -; 64-bit Program Files directory and the 64-bit view of the registry. -ArchitecturesInstallIn64BitMode=x64 +; "ArchitecturesAllowed=x64compatible" specifies that Setup cannot run +; on anything but x64 and Windows 11 on Arm. +ArchitecturesAllowed=x64compatible +; "ArchitecturesInstallIn64BitMode=x64compatible" requests that the +; install be done in "64-bit mode" on x64 or Windows 11 on Arm, +; meaning it should use the native 64-bit Program Files directory and +; the 64-bit view of the registry. +ArchitecturesInstallIn64BitMode=x64compatible OutputBaseFilename=welle-io_install_x64 LicenseFile=..\COPYING SetupIconFile=..\src\welle-gui\icons\icon.ico