Separate experimental and stable builds for Linux

OoliteProject · Jul 15, 2024 · 6398fe0 · 6398fe0
1 parent 2459451
commit 6398fe0
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,6 +22,7 @@ jobs:
       GITVERSION_PATCH: ${{ steps.gitversion.outputs.GITVERSION_PATCH }}
       MACOS_MAJORMINORPATCH: ${{ steps.output1.outputs.MACOS_MAJORMINORPATCH }}
       DEBIAN_PKGVERSION: ${{ steps.output1.outputs.DEBIAN_PKGVERSION }}
+      FLAVOR: ${{ steps.gitversion.outputs.FLAVOR }}
     steps:
     - name: Checkout project
       uses: actions/checkout@v4
@@ -54,6 +55,10 @@ jobs:
         else
           echo "MACOS_MAJORMINORPATCH=${GitVersion_MajorMinorPatch}" >> "$GITHUB_OUTPUT"
         fi
+        if [ "$GITHUB_REF_NAME" != "master" ]
+        then
+          echo "FLAVOR=_${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
+        fi
 
   build:
     needs: [semver]
@@ -135,7 +140,7 @@ jobs:
           --app-version "${{ needs.semver.outputs.DEBIAN_PKGVERSION }}" \
           --copyright Copyright \
           --description "OoliteStarter ${{ needs.semver.outputs.GITVERSION_SEMVER }}" \
-          --name "OoliteStarter" \
+          --name "OoliteStarter${{ needs.semver.outputs.FLAVOR }}" \
           --dest target/appimage \
           --temp target/oolite-starter-tmp \
           --vendor "OoliteProject" \
@@ -150,7 +155,7 @@ jobs:
 
     - name: Tweak AppImage
       run: |
-        cp -v "oolitestarter/src/jpackage/resources-linux/OoliteStarter.desktop" "target/appimage/OoliteStarter/lib/oolitestarter-OoliteStarter.desktop"
+        cp -v "oolitestarter/src/jpackage/resources-linux/OoliteStarter.desktop" "target/appimage/OoliteStarter${{ needs.semver.outputs.FLAVOR }}/lib/oolitestarter-OoliteStarter.desktop"
       # cp -v "oolitestarter/src/main/resources/images/OoliteStarter_Splashscreen_640x360.png" "target/appimage/OoliteStarter/lib/app/splash.png"
 
     - name: Check status 2
@@ -164,8 +169,8 @@ jobs:
       run: |
         jpackage \
           --verbose \
-          --app-image target/appimage/OoliteStarter \
-          --name "OoliteStarter" \
+          --app-image target/appimage/OoliteStarter${{ needs.semver.outputs.FLAVOR }} \
+          --name "OoliteStarter${{ needs.semver.outputs.FLAVOR }}" \
           --app-version "${{ needs.semver.outputs.DEBIAN_PKGVERSION }}" \
           --dest target \
           --license-file oolitestarter/LICENSE \