Skip to content

Commit df60373

Browse files
committed
Modern win installer
1 parent 84b2756 commit df60373

File tree

6 files changed

+6
-266
lines changed

6 files changed

+6
-266
lines changed

.github/workflows/build.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ jobs:
224224
git diff --binary origin/main...origin/demo > demo.patch
225225
git apply demo.patch
226226
227+
- name: Get installer source
228+
run: git checkout origin/win-installer -- ./win-installer.nsi
229+
227230
- name: Install Qt (MinGW)
228231
uses: jurplel/install-qt-action@v4
229232
with:
@@ -267,17 +270,17 @@ jobs:
267270

268271
- name: Create NSIS installer
269272
run: |
270-
makensis /DAPP_NAME="${{ env.APP_NAME }}" /DPACKAGE_VERSION="${{ env.PACKAGE_VERSION }}" win-installer\installer.nsi
273+
makensis /DAPP_NAME="${{ env.APP_NAME }}" /DPACKAGE_VERSION="${{ env.PACKAGE_VERSION }}" win-installer.nsi
271274
272275
- name: Rename installer
273276
if: matrix.demo == true
274277
run: |
275-
MOVE "win-installer\${{ env.APP_NAME }}-${{ env.PACKAGE_VERSION }}.exe" "${{ env.APP_NAME }}-${{ env.PACKAGE_VERSION }}-demo.exe"
278+
MOVE "${{ env.APP_NAME }}-${{ env.PACKAGE_VERSION }}.exe" "${{ env.APP_NAME }}-${{ env.PACKAGE_VERSION }}-demo.exe"
276279
277280
- name: Zip builds
278281
if: matrix.demo == false
279282
run: |
280-
MOVE "win-installer\${{ env.APP_NAME }}-${{ env.PACKAGE_VERSION }}.exe" "${{ env.APP_NAME }}-${{ env.PACKAGE_VERSION }}.exe"
283+
MOVE "${{ env.APP_NAME }}-${{ env.PACKAGE_VERSION }}.exe" "${{ env.APP_NAME }}-${{ env.PACKAGE_VERSION }}.exe"
281284
7z a -p"${{ secrets.ZIP_PASSWORD }}" -tzip "${{ env.APP_NAME }}-${{ env.PACKAGE_VERSION }}.zip" "${{ env.APP_NAME }}-${{ env.PACKAGE_VERSION }}.exe"
282285
283286
- name: Upload artifacts (demo)
File renamed without changes.

buildmac.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

win-installer/files.nsi

Lines changed: 0 additions & 2 deletions
This file was deleted.

win-installer/installer.nsi

Lines changed: 0 additions & 246 deletions
This file was deleted.

win-installer/unfiles.nsi

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)