From 6fc554827818f93e09e850c8ca36e30ef59ff374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= <gregoire.henry@oma.be>
Date: Wed, 15 Nov 2023 03:54:23 +0100
Subject: [PATCH] test compile setup and ship

---
 .github/workflows/check.yml   |  6 ------
 .github/workflows/release.yml | 16 +++++++++++-----
 bin/installer.iss             | 14 ++++----------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 5459caf..c4534e9 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -58,12 +58,6 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Test Inno
-      run: iscc /?
-
-    - name: Test Inno 2
-      run: ISCC.exe /?
-
     - name: Cache Rust dependencies
       uses: actions/cache@v3
       with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 44c4a66..5b71abb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,6 @@ jobs:
     - name: Build examples
       run: cargo build -r --example viewer-picker && strip target/release/examples/viewer-picker
 
-
     - name: Make bundle
       run: |
         mkdir -p bin/ubuntu
@@ -42,11 +41,12 @@ jobs:
         cd bin/ubuntu
         cp -r examples/thermal/cfg .
         tar cvzf kalast-${{ github.ref_name }}-ubuntu.tar.gz *
+        mv kalast-${{ github.ref_name }}-ubuntu.tar.gz ..
 
     - name: Release
       uses: softprops/action-gh-release@v1
       with:
-        files: bin/ubuntu/kalast-${{ github.ref_name }}-ubuntu.tar.gz 
+        files: bin/kalast-${{ github.ref_name }}-ubuntu.tar.gz 
         prerelease: true
           
   release-macos:
@@ -84,11 +84,12 @@ jobs:
         cd bin/macos
         cp -r examples/thermal/cfg .
         tar cvzf kalast-${{ github.ref_name }}-macos.tar.gz *
+        mv kalast-${{ github.ref_name }}-macos.tar.gz ..
 
     - name: Release
       uses: softprops/action-gh-release@v1
       with:
-        files: bin/macos/kalast-${{ github.ref_name }}-macos.tar.gz 
+        files: bin/kalast-${{ github.ref_name }}-macos.tar.gz
         prerelease: true
 
   release-windows:
@@ -119,7 +120,6 @@ jobs:
     - name: Build examples
       run: cargo build -r --example viewer-picker
 
-
     - name: Make bundle
       run: |
         mkdir -p bin/win
@@ -134,9 +134,15 @@ jobs:
         cd bin/win
         cp -r examples/thermal/cfg .
         Compress-Archive * kalast-${{ github.ref_name }}-win.zip
+        mv kalast-${{ github.ref_name }}-win.zip ..
+        
+    - name: Try compile Inno
+      run: cd bin && iscc ./installer.iss
 
     - name: Release
       uses: softprops/action-gh-release@v1
       with:
-        files: bin/win/kalast-${{ github.ref_name }}-win.zip
+        files: |
+          bin/kalast-${{ github.ref_name }}-win.zip
+          bin/setup-kalast-${{ github.ref_name }}.exe
         prerelease: true
\ No newline at end of file
diff --git a/bin/installer.iss b/bin/installer.iss
index c47c1ad..ef8c363 100644
--- a/bin/installer.iss
+++ b/bin/installer.iss
@@ -1,9 +1,6 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
 #define NAME "kalast"
-#define VERSION "0.3.6"
-#define ROOT "C:\projects\kalast"
+#define VERSION "0.3.8"
+#define ROOT ".."
 #define URL "https://github.com/GregoireHENRY/kalast"
 #define PUBLISHER "NT Productions"
 
@@ -20,7 +17,7 @@ CreateAppDir=yes
 DefaultDirName=C:\Program Files\{#NAME}
 DefaultGroupName={#NAME}
 DisableWelcomePage=no
-OutputDir={#ROOT}\bin\releases
+OutputDir=.
 OutputBaseFilename=setup-{#NAME}-v{#VERSION}
 Compression=lzma
 SolidCompression=yes
@@ -34,7 +31,4 @@ Name: "{group}\{#NAME}"; Filename: "{app}\{#NAME}.exe"; WorkingDir: "{app}"; Ico
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
-Source: "{#ROOT}\bin\releases\{#NAME}-v{#VERSION}-win\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#ROOT}\include\*"; DestDir: "{app}"; Flags: onlyifdoesntexist
-Source: "{#ROOT}\include\win\*"; DestDir: "{app}"; Flags: onlyifdoesntexist
-Source: "{#ROOT}\README.md"; DestDir: "{app}";
\ No newline at end of file
+Source: ".\win\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
\ No newline at end of file