From 077951ed75a5ea602b548f2617894ef89a87ac56 Mon Sep 17 00:00:00 2001
From: Abhinay Agarwal <abhinay.agarwal@gluonhq.com>
Date: Fri, 26 Mar 2021 18:52:59 +0530
Subject: [PATCH] Update workflows

---
 .github/scripts/jpackage.bat | 2 +-
 .github/workflows/build.yml  | 2 +-
 .github/workflows/kit.yml    | 4 ++--
 .github/workflows/linux.yml  | 2 +-
 .github/workflows/mac.yml    | 6 +++---
 .github/workflows/win.yml    | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/scripts/jpackage.bat b/.github/scripts/jpackage.bat
index fbecb6bba..7441a01c6 100644
--- a/.github/scripts/jpackage.bat
+++ b/.github/scripts/jpackage.bat
@@ -21,7 +21,7 @@ REM set MODULES=java.desktop,java.logging,java.naming,java.prefs,java.security.j
 --vendor Gluon ^
 --verbose ^
 --runtime-image app/target/runtime ^
---dest %$INSTALL_DIR% ^
+--dest %INSTALL_DIR% ^
 --type msi ^
 --java-options "--add-opens=javafx.fxml/javafx.fxml=ALL-UNNAMED" ^
 --icon app/assets/windows/icon-windows.ico ^
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 48e666eab..80ca149e9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,5 +30,5 @@ jobs:
           echo 123456 | vncpasswd -f > /home/runner/.vnc/passwd
           chmod -v 600 /home/runner/.vnc/passwd
           vncserver :90 -localhost -nolisten tcp
-          mvn clean verify
+          mvn clean verify -X
           vncserver -kill :90
\ No newline at end of file
diff --git a/.github/workflows/kit.yml b/.github/workflows/kit.yml
index 1c6b1c037..41ab71a10 100644
--- a/.github/workflows/kit.yml
+++ b/.github/workflows/kit.yml
@@ -29,13 +29,13 @@ jobs:
           AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
       - name: Create Kit Jar
         run: |
-          chmod +x gradlew
           export DISPLAY=:90
           mkdir /home/runner/.vnc
           echo 123456 | vncpasswd -f > /home/runner/.vnc/passwd
           chmod -v 600 /home/runner/.vnc/passwd
           vncserver :90 -localhost -nolisten tcp
-          ./gradlew -i clean :kit:build -PVERSION=$TAG
+          mvn -q versions:set -DnewVersion=${{ env.TAG }} -DgenerateBackupPoms=false
+          mvn clean package -Dmaven.test.skip=true -X
           vncserver -kill :90
         env:
           TAG: ${{ steps.variables.outputs.SOURCE_TAG }}
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 24302702a..8c2ee92fd 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Build and package JAR
         run: |
           mvn -q versions:set -DnewVersion=${{ env.VERSION }} -DgenerateBackupPoms=false
-          mvn -q package -Dmaven.test.skip=true
+          mvn -q package -Dmaven.test.skip=true -X
         env:
           VERSION: ${{ steps.variables.outputs.SOURCE_VERSION }}
       - name: Create Bundle using JPackage
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index a22c3c7c7..e12c3d520 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Build and package JAR
         run: |
           mvn -q versions:set -DnewVersion=${{ env.VERSION }} -DgenerateBackupPoms=false
-          mvn -q package -Dmaven.test.skip=true
+          mvn -q package -Dmaven.test.skip=true -X
         env:
           VERSION: ${{ steps.variables.outputs.SOURCE_VERSION }}
       - name: Create Bundle using JPackage
@@ -51,8 +51,8 @@ jobs:
           --type dmg \
           --mac-package-identifier com.gluonhq.scenebuilder \
           --mac-package-name 'Scene Builder' \
-          --mac-package-signing-prefix $GLUON_MACSIGN_PREFIX \
-          --mac-signing-key-user-name $GLUON_MACSIGN_USER \
+          --mac-package-signing-prefix "$GLUON_MACSIGN_PREFIX" \
+          --mac-signing-key-user-name "$GLUON_MACSIGN_USER" \
           --mac-sign
           mv $INSTALL_DIR/SceneBuilder-${{ env.VERSION }}.dmg $INSTALL_DIR/SceneBuilder-${{ env.TAG }}.dmg
           ls $INSTALL_DIR
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 41c36e1fe..cae85f8a5 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -36,7 +36,7 @@ jobs:
         shell: cmd
         run: |
           call mvn versions:set -DnewVersion=${{ env.VERSION }} -DgenerateBackupPoms=false
-          call mvn package -Dmaven.test.skip=true
+          call mvn package -Dmaven.test.skip=true -X
         env:
           VERSION: ${{ steps.variables.outputs.SOURCE_VERSION }}
       - name: Create Bundle using JPackage
@@ -58,7 +58,7 @@ jobs:
           certificate: '${{ secrets.WINDOWS_CERTIFICATE }}'
           password: '${{ secrets.WINDOWS_PASSWORD }}'
           certificatename: '${{ secrets.WINDOWS_CERTNAME }}'
-          folder: 'app/build'
+          folder: 'app/target/install'
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with: