[GHA] Init windows.msi built

ci release
gama-platform · Apr 25, 2022 · c839507 · c839507
1 parent 022fdc1
commit c839507
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 8 deletions.
diff --git a/.github/actions/macOS-sign/action.yaml b/.github/actions/macOS-sign/action.yaml
@@ -38,7 +38,6 @@ runs:
         mkdir -p ${{ github.workspace }}/artifacts/work
 
     - uses: actions/download-artifact@v2
-      shell: bash
       with:
         name: gama-mac-unsigned
         path: ./artifacts/
@@ -99,7 +98,6 @@ runs:
         xcrun -v stapler staple ./${{ inputs.toSignedZipName }}.dmg
 
     - uses: actions/upload-artifact@v3
-      shell: bash
       env: 
         working_directory: ${{ github.workspace }}/artifacts/work
       with:

diff --git a/.github/workflows/github-travis.yml b/.github/workflows/github-travis.yml
@@ -81,6 +81,7 @@ jobs:
           # MacOS Family
           mv ${{ github.workspace }}/ummisco.gama.product/target/products/Gama*zip ${{ github.workspace }}
           mv ${{ github.workspace }}/travis/mac-sign.sh ${{ github.workspace }}
+          mv ${{ github.workspace }}/ummisco.gama.product/extraresources/installer/windows/* ${{ github.workspace }}
           # Debian Family
           mv Gama1.7-linux.gtk.x86_64.zip gama-platform_1.8.2-1_amd64.zip
           mv Gama1.7-linux.gtk.x86_64_withJDK.zip gama-platform-jdk_1.8.2-1_amd64.zip
@@ -108,7 +109,16 @@ jobs:
       - uses: actions/upload-artifact@v2
         if: env.CONTINUE == 'true'
         with:
-          name: gama-jdk-builds
+          name: gama-windows
+          path: |
+            ./Gama1.7-win32*zip
+            ./icon256.ico
+            ./windows_installer_script.iss
+
+      - uses: actions/upload-artifact@v2
+        if: env.CONTINUE == 'true'
+        with:
+          name: gama-zip-builds
           path: |
             ./Gama*zip
           
@@ -240,11 +250,45 @@ jobs:
           path: |
             ${{ github.workspace }}/${{ matrix.zipName }}.deb
   
+  #
+  # Windows packaging Pipelines
+  #
+  windows-msi:
+    needs: build
+    if: needs.build.outputs.continue_pipeline == 'true'
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        zipName: [Gama1.7-win32.win32.x86_64.zip, Gama1.7-win32.win32.x86_64_withJDK.zip]
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: gama-windows
+
+      - name: Change variables for JDK installer
+        if: contains( matrix.zipName, 'withJDK')
+        run: |
+          get-content windows_installer_script.iss | %{$_ -replace "x86_64","x86_64_withJDK"}
+
+      - name: Prepare vm
+        run: |
+          mkdir gama_output
+
+      - name: Create installer
+        run: iscc.exe windows_installer_script.iss
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: gama-windows-exe
+          path: |
+            gama_output
+
+  
   #
   # Github releasing
   #
   publish-archives:
-    needs: [macOS-signing-aarch64, macOS-signing-aarch64_withJDK, debian-archive]
+    needs: [macOS-signing-aarch64, macOS-signing-aarch64_withJDK, debian-archive, windows-msi]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -264,6 +308,11 @@ jobs:
         with:
           name: gama-linux-deb
 
+      # Get Linux deb archive
+      - uses: actions/download-artifact@v2
+        with:
+          name: gama-windows-exe
+
       - name: Set Travis env
         run: |
           if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then

diff --git a/...ller/windows/windows installer script.iss → ...ller/windows/windows_installer_script.iss b/...ller/windows/windows installer script.iss → ...ller/windows/windows_installer_script.iss
@@ -4,10 +4,11 @@
 
 ; To replace at deployment time
 #define AppExeName "Gama.exe"
-#define AppDirPath "C:\GAMA_1.8.2_Windows_with_JDK_03.21.22_b6da0133"
+#define AppDirPath ".\Gama1.7-win32.win32.x86_64.zip"
+#define MsiOutputFilename "Gama_installer_x86_64"
 #define LicensePath ".\LICENSE"
-#define SetupIconPath "C:\Users\Baptiste\Downloads\icon256.ico"
-#define OutputDirPath ".\gama installer"
+#define SetupIconPath ".\icon256.ico"
+#define OutputDirPath ".\gama_output"
 
 #define MyAppName "Gama"
 #define MyAppVersion "1.8.2"
@@ -36,7 +37,7 @@ LicenseFile={#LicensePath}
 ;PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=dialog
 OutputDir={#OutputDirPath}
-OutputBaseFilename=Gama installer
+OutputBaseFilename={#MsiOutputFilename}
 SetupIconFile={#SetupIconPath}
 Compression=lzma
 SolidCompression=yes