1.3.0 Try to fix errors

taranion · Oct 31, 2023 · bd16530 · bd16530
1 parent ccc812c
commit bd16530
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 25 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -92,31 +92,31 @@ jobs:
 
     - name: setup-graalvm-ce
       uses: taranion/setup-graalvm@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Set Release version env variable
       run: |
         echo "RELEASE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
         
-    - name: Compile update artifact
-      run: mvn -s settings.xml package
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#    - name: Compile update artifact
+#      run: mvn -s settings.xml package
+#      env:
+#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Upload update artifact
-      continue-on-error: false
-      uses: garygrossgarten/github-action-scp@release
-      with:
-        verbose: true
-        local: target/commlink6-${{ env.RELEASE_VERSION }}-jar-with-dependencies.jar
-        remote: /var/www/html/commlink6-updates/linux/commLink6-${{env.RELEASE_VERSION}}.jar
-        host: eden.rpgframework.de
-        username: ghcommlink
-        password: ${{ secrets.DEPLOY_PASSWORD }}
+#    - name: Upload update artifact
+#      continue-on-error: false
+#      uses: garygrossgarten/github-action-scp@release
+#      with:
+#        verbose: true
+#        local: target/commlink6-binary-${{ env.RELEASE_VERSION }}-jar-with-dependencies.jar
+#        remote: /var/www/html/commlink6-updates/linux/commLink6-${{env.RELEASE_VERSION}}.jar
+#        host: eden.rpgframework.de
+#        username: ghcommlink
+#        password: ${{ secrets.DEPLOY_PASSWORD }}
 
     - name: JPackage
-      run:  mvn jpackage:jpackage
+      run:  mvn -s settings.xml -B jpackage:jpackage
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Show result
       run: ls target/jpackage
@@ -136,7 +136,7 @@ jobs:
       continue-on-error: false
       uses: garygrossgarten/github-action-scp@release
       with:
-        verbose: true
+        verbose: false
         local: target/jpackage/commlink6_${{ env.RELEASE_VERSION }}-1_amd64.deb
         remote: /var/www/html/commlink6-builds/linux/CommLink6-jre-${{env.RELEASE_VERSION}}.deb
         host: eden.rpgframework.de

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -9,7 +9,7 @@ env:
   LANG: "de_DE.UTF-8"
 
 jobs:
-  compile-osx:
+  compile-osx-native:
     runs-on: macos-latest
     steps:
     - name: checkout sources
@@ -85,7 +85,7 @@ jobs:
         username: ghcommlink
         password: ${{ secrets.DEPLOY_PASSWORD }}
 
-    - name: Upload
+    - name: Upload APP bundle
       continue-on-error: true
       uses: garygrossgarten/github-action-scp@release
       with:
@@ -103,10 +103,10 @@ jobs:
     - name: checkout sources
       uses: actions/checkout@v3
 
-    - name: setup-graalvm-ce
-      uses: taranion/setup-graalvm@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '20'
 
     - name: Set Release version env variable
       run: |
@@ -119,7 +119,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: JPackage
-      run:   mvn jpackage:jpackage@osx
+      run:   mvn -s settings jpackage:jpackage@osx
       env:
         LANG: en_EN
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -173,6 +173,7 @@ jobs:
     needs: [compile-windows-jre]
     steps:
       - name: Configure Store Credentials
+        continue-on-error: true
         uses: microsoft/store-submission@v1
         with:
           command: configure
@@ -184,12 +185,14 @@ jobs:
           client-secret: ${{ secrets.CLIENT_SECRET }}
 
       - name: Update Draft Submission
+        continue-on-error: true
         uses: microsoft/store-submission@v1
         with:
           command: update
           product-update: '{"packages":[{"packageUrl":"https://eden.rpgframework.de/commlink6-builds/win/CommLink6-Interpreted-Installer-${{env.RELEASE_VERSION}}.msi","languages":["en"],"architectures":["X64"],"isSilentInstall":true}]}'
 
       - name: Publish Submission
+        continue-on-error: true
         uses: microsoft/store-submission@v1
         with:
           command: publish