From d8f016ccc32b701d600bdcaa87fedf57cb3ea702 Mon Sep 17 00:00:00 2001
From: Quackster <quacksterr.15@gmail.com>
Date: Sat, 17 Sep 2022 08:51:45 +1000
Subject: [PATCH] Update pre-release.yml

---
 .github/workflows/pre-release.yml | 41 +++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index 5fea002..bdcefd8 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -14,21 +14,43 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
           cache: gradle
-      - name: Build with Gradle
-        run: ./gradlew fatJar
+      - name: Build distribution with Gradle
+        run: ./gradlew distZip
+        
+      - name: Decompress distribution file
+        uses: montudor/action-zip@v1
+        with:
+          args: unzip -qq Havana-Web/build/distributions/Havana-Web.zip -d ./release
+          
+      - name: File release preparation
+        run: |
+          sudo rm -rf ./release/Havana-Server/bin/*
+          sudo rm -rf ./release/Havana-Server/bin
+          sudo mkdir ./Havana
+          sudo mkdir ./Havana/lib
+          sudo mv ./release/Havana-Server/lib/Havana-Server.jar ./Havana/Havana-Server.jar
+          sudo mv ./release/Havana-Server/lib/Havana-Web.jar ./Havana/Havana-Web.jar
+          sudo mv ./release/Havana-Server/lib/* ./Havana/lib
+          sudo cp tools/scripts/run_server.bat ./Havana/
+          sudo cp tools/scripts/run_server.sh ./Havana/
+          sudo cp tools/scripts/run_web.bat ./Havana/
+          sudo cp tools/scripts/run_web.sh ./Havana/
+
       - id: sha-short
         name: Get short SHA
         run: echo "::set-output name=sha-short::$(git rev-parse --short HEAD)"
-      - name: Rename server jar file
-        run: cp Havana-Server/build/libs/Havana-Server-all.jar Havana-Server-${{ steps.sha-short.outputs.sha-short }}.jar
-      - name: Rename web jar file
-        run: cp Havana-Web/build/libs/Havana-Web-all.jar Havana-Web-${{ steps.sha-short.outputs.sha-short }}.jar
+        
+      - name: Compress release files
+        uses: montudor/action-zip@v1
+        with:
+          args: zip -qq -r ./Havana-${{ steps.sha-short.outputs.sha-short }}.zip ./Havana
+          
       - uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
@@ -36,5 +58,4 @@ jobs:
           prerelease: true
           title: "Development Build ${{ steps.sha-short.outputs.sha-short }}"
           files: |
-            Havana-Server-${{ steps.sha-short.outputs.sha-short }}.jar
-            Havana-Web-${{ steps.sha-short.outputs.sha-short }}.jar
\ No newline at end of file
+            Havana-${{ steps.sha-short.outputs.sha-short }}.zip
\ No newline at end of file