From a2336683867fc2cf037e3f54dc84a59161aebc1f Mon Sep 17 00:00:00 2001
From: Argent77 <4519923+Argent77@users.noreply.github.com>
Date: Wed, 24 Apr 2024 15:59:35 +0200
Subject: [PATCH] CD: Test different JDK distributions

---
 .github/workflows/deploy.yml | 51 ++++++------------------------------
 1 file changed, 8 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f5ab18657..26383fc53 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,7 +7,7 @@ on:
   push:
     branches: [ "master" ]
   workflow_dispatch:
-    branches: [ "master", "devel" ]
+    branches: [ "master", "devel", "macos-deploy-test" ]
 
 permissions:
   contents: read
@@ -48,10 +48,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ windows-latest, macos-13 ]
+        os: [ macos-14 ]
         java: [ '21' ]
+        distribution: [ 'temurin', 'corretto', 'oracle' ]
     runs-on: ${{ matrix.os }}
-    name: Create installer for ${{ matrix.os }}, JDK ${{ matrix.java }}
+    name: Create installer for ${{ matrix.os }}, JDK ${{ matrix.java }} (${{ matrix.distribution }})
     steps:
       # Initializations
       - name: Git checkout
@@ -61,16 +62,9 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'temurin'
-
-      - name: Echo JAVA_HOME (windows)
-        if: startsWith(matrix.os, 'windows-')
-        run: |
-          echo $env:JAVA_HOME
-          java -version
+          distribution: ${{ matrix.distribution }}
 
-      - name: Echo JAVA_HOME (macos)
-        if: startsWith(matrix.os, 'macos-')
+      - name: Echo JAVA_HOME
         run: |
           echo $JAVA_HOME
           java -version
@@ -89,17 +83,7 @@ jobs:
           path: assets
 
       # Building
-      - name: Build portable archive and installer (windows)
-        if: startsWith(matrix.os, 'windows-')
-        run: |
-          move assets\redistributable\windows\package .
-          move assets\redistributable\windows\build-image.cmd .
-          move assets\redistributable\windows\build-installer.cmd .
-          .\build-image.cmd
-          .\build-installer.cmd
-
-      - name: Build installer (macos)
-        if: startsWith(matrix.os, 'macos-')
+      - name: Build installer
         run: |
           mv assets/redistributable/macos/package .
           mv assets/redistributable/macos/build.command .
@@ -107,32 +91,13 @@ jobs:
           ./build.command
 
       # Validation
-      - name: List built files (windows)
-        if: startsWith(matrix.os, 'windows-')
-        run: dir
-
       - name: List built files (macos)
-        if: startsWith(matrix.os, 'macos-')
         run: ls -l
 
       # Uploading
-      - name: Upload portable artifact (windows)
-        if: startsWith(matrix.os, 'windows-')
-        uses: actions/upload-artifact@v4
-        with:
-          name: portable-windows
-          path: NearInfinity-*.zip
-
-      - name: Upload exe artifact (windows)
-        if: startsWith(matrix.os, 'windows-')
-        uses: actions/upload-artifact@v4
-        with:
-          name: installer-windows
-          path: NearInfinity-*.exe
-
       - name: Upload pkg artifact (macos)
         if: startsWith(matrix.os, 'macos-')
         uses: actions/upload-artifact@v4
         with:
-          name: installer-macos-x86_64
+          name: installer-macos-arm64-${{ matrix.distribution }}
           path: NearInfinity-*.pkg