Update GitHub CI pipeline

AlexProgrammerDE · Mar 10, 2024 · 2166c9d · 2166c9d
1 parent cdef526
commit 2166c9d
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,18 +22,20 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
       - name: Execute Gradle build
         run: ./gradlew build test --stacktrace
-      - name: Prepare Upload
-        run: |
-          projectVersion=$(grep '^mavenVersion=' gradle.properties | cut -d'=' -f2)
-          mkdir build/upload
-          cp build/libs/SoulFire-$projectVersion.jar build/upload
-      - name: Upload a Build Artifact
+      - name: Upload client Build Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: SoulFireClient
+          if-no-files-found: error
+          path: |
+            client/build/libs/*.jar
+      - name: Upload dedicated Build Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: SoulFire
+          name: SoulFireDedicated
           if-no-files-found: error
           path: |
-            build/upload/SoulFire-*.jar
+            dedicated/build/libs/*.jar
   jpackage-linux:
     needs: build
     runs-on: ubuntu-latest
@@ -43,7 +45,7 @@ jobs:
       - name: Download a Build Artifact
         uses: actions/download-artifact@v4
         with:
-          name: SoulFire
+          name: SoulFireClient
           path: build/libs
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -56,8 +58,8 @@ jobs:
         run: |
           projectVersion=$(grep '^mavenVersion=' gradle.properties | cut -d'=' -f2)
           projectVersionStripped=${projectVersion/-SNAPSHOT/}
-          jpackage --app-version $projectVersionStripped --main-jar "SoulFire-$projectVersion.jar" "@installer/jpackage.cfg" "@installer/jpackage-linux.cfg" --type rpm
-          jpackage --app-version $projectVersionStripped --main-jar "SoulFire-$projectVersion.jar" "@installer/jpackage.cfg" "@installer/jpackage-linux.cfg" --type deb
+          jpackage --app-version $projectVersionStripped --main-jar "SoulFireClient-$projectVersion.jar" "@installer/jpackage.cfg" "@installer/jpackage-linux.cfg" --type rpm
+          jpackage --app-version $projectVersionStripped --main-jar "SoulFireClient-$projectVersion.jar" "@installer/jpackage.cfg" "@installer/jpackage-linux.cfg" --type deb
       - name: Upload installer
         uses: actions/upload-artifact@v4
         with:
@@ -74,7 +76,7 @@ jobs:
       - name: Download a Build Artifact
         uses: actions/download-artifact@v4
         with:
-          name: SoulFire
+          name: SoulFireClient
           path: build/libs
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -85,7 +87,7 @@ jobs:
         run: |
           $projectVersion = Select-String -Path gradle.properties -Pattern '^mavenVersion=' | ForEach-Object { $_.ToString().Split('=')[1] }
           $projectVersionStripped = $projectVersion -replace '-SNAPSHOT', '' 
-          jpackage --app-version $projectVersionStripped --main-jar "SoulFire-$projectVersion.jar" "@installer/jpackage.cfg" "@installer/jpackage-windows.cfg"
+          jpackage --app-version $projectVersionStripped --main-jar "SoulFireClient-$projectVersion.jar" "@installer/jpackage.cfg" "@installer/jpackage-windows.cfg"
       - name: Upload installer
         uses: actions/upload-artifact@v4
         with:
@@ -102,7 +104,7 @@ jobs:
       - name: Download a Build Artifact
         uses: actions/download-artifact@v4
         with:
-          name: SoulFire
+          name: SoulFireClient
           path: build/libs
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -113,7 +115,7 @@ jobs:
         run: |
           projectVersion=$(grep '^mavenVersion=' gradle.properties | cut -d'=' -f2)
           projectVersionStripped=${projectVersion/-SNAPSHOT/}
-          jpackage --app-version $projectVersionStripped --main-jar "SoulFire-$projectVersion.jar" "@installer/jpackage.cfg" "@installer/jpackage-mac.cfg"
+          jpackage --app-version $projectVersionStripped --main-jar "SoulFireClient-$projectVersion.jar" "@installer/jpackage.cfg" "@installer/jpackage-mac.cfg"
       - name: Upload installer
         uses: actions/upload-artifact@v4
         with: