Updating Actions

CulverLab · Sep 4, 2024 · a57655d · a57655d
1 parent 9e48ced
commit a57655d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -14,6 +14,16 @@ jobs:
       fail-fast: false
       matrix:
         platform: [ubuntu-latest, windows-latest, macos-latest, macos-14]
+        include:
+          - platform: ubuntu-latest
+            jar_file_name: sparcd-ubuntu-latest.jar
+          - platform: windows-latest
+            jar_file_name: sparcd-windows-latest.jar
+          - platform: macos-latest
+            jar_file_name: macos-latest.jar
+          - platform: macos-14
+            jar_file_name: sparcd-AppleSilicon.jar
+            extra_maven_flags: -Denv=AppleSilicon
 
     runs-on: ${{ matrix.platform }}
     steps:
@@ -27,20 +37,15 @@ jobs:
           java-version: 21
 
       - name: Build with Maven
-        if: ${{ matrix.platform != 'macos-14' }}
-        run: cd "Sanimal FX" && mvn -U compile package && mv target/SanimalFX-1.0-SNAPSHOT-jar-with-dependencies.jar ../sparcd-${{ matrix.platform }}.jar
-
-      - name: Build with Maven Mac Silicon
-        if: ${{ matrix.platform == 'macos-14' }}
-        run: cd "Sanimal FX" && mvn -U -Denv=MacSilicon compile package && mv target/SanimalFX-1.0-SNAPSHOT-jar-with-dependencies.jar ../sparcd-MacSilicon.jar
+        run: cd "Sanimal FX" && mvn -U ${{ extra_maven_flags }} compile package && mv target/SanimalFX-1.0-SNAPSHOT-jar-with-dependencies.jar ../${{ matrix.jar_file_name }}
 
       - name: Upload prerelease assets
         uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           name: Prerelease Build
-          files: sparcd-${{ matrix.platform }}.jar
+          files: ${{ matrix.jar_file_name }}
           draft: true
           prerelease: true
           fail_on_unmatched_files: true
diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml
@@ -12,7 +12,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, windows-latest, macos-latest]
+        platform: [ubuntu-latest, windows-latest, macos-latest, macos-14]
+        include:
+          - platform: ubuntu-latest
+            jar_file_name: sparcd-ubuntu-latest.jar
+          - platform: windows-latest
+            jar_file_name: sparcd-windows-latest.jar
+          - platform: macos-latest
+            jar_file_name: macos-latest.jar
+          - platform: macos-14
+            jar_file_name: sparcd-AppleSilicon.jar
+            extra_maven_flags: -Denv=AppleSilicon
 
     runs-on: ${{ matrix.platform }}
     steps:
@@ -26,7 +36,7 @@ jobs:
           java-version: 21
 
       - name: Build with Maven
-        run: cd "Sanimal FX" && mvn -U compile package && mv target/SanimalFX-1.0-SNAPSHOT-jar-with-dependencies.jar ../sparcd-${{ matrix.platform }}.jar
+        run: cd "Sanimal FX" && mvn -U ${{ extra_maven_flags }} compile package && mv target/SanimalFX-1.0-SNAPSHOT-jar-with-dependencies.jar ../${{ matrix.jar_file_name }}
 
       - name: set date env var
         if: ${{ matrix.platform != 'windows-latest' }}
@@ -42,7 +52,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           name: Release Build ${{ env.NOW }}
-          files: sparcd-${{ matrix.platform }}.jar
+          files: ${{ matrix.jar_file_name }}
           draft: false
           prerelease: false
           fail_on_unmatched_files: true

diff --git a/Sanimal FX/pom.xml b/Sanimal FX/pom.xml
@@ -28,12 +28,12 @@
             </properties>
         </profile>
         <profile>
-            <!-- Enable by using "-DMacSilicon" on Maven command line -->
-            <id>MacSilicon</id>
+            <!-- Enable by using "-Denv=AppleSilicon" on Maven command line -->
+            <id>AppleSilicon</id>
             <activation>
                 <property>
                     <name>env</name>
-                    <value>MacSilicon</value>
+                    <value>AppleSilicon</value>
                 </property>
             </activation>
             <properties>