From a1284ff9cbb17cc9a60d588d6d338224a0343add Mon Sep 17 00:00:00 2001
From: Andrew Molchanov <mr.catmanrus@gmail.com>
Date: Mon, 27 Sep 2021 09:54:27 +0300
Subject: [PATCH] =?UTF-8?q?[FIX]=20GitHub=20Actions=20-=20=D0=9F=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B8=20=D0=BE=D0=BF=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20(#520)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [FIX] GitHub Actions - Вернул Release.zip

* [FIX] GitHub Actions - Доработал LauncherBase.zip

Так всё ж куда проще, лол

* [FIX] GitHub Actions - фикс захода в папку

* [FIX] GitHub Actions - Немножко оптимизации
---
 .github/workflows/push.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 94bb7168..4ba9cb77 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -30,14 +30,12 @@ jobs:
       - name: Create artifacts
         run: |
           mkdir -p artifacts/modules
-          cd LaunchServer/build/libs/
+          cd LaunchServer/build/libs
           zip -r -9 ../../../artifacts/libraries.zip * -x "LaunchServer.jar" -x "LaunchServer-clean.jar"
           cp LaunchServer.jar ../../../artifacts/LaunchServer.jar
-          cd ../../../ServerWrapper/build/libs
-          cp ServerWrapper.jar ../../../artifacts/ServerWrapper.jar
-          cd ../../../LauncherAuthlib/build/libs
-          cp LauncherAuthlib.jar ../../../artifacts/LauncherAuthlib.jar
-          cd ../../../
+          cd ../../..
+          cp ServerWrapper/build/libs/ServerWrapper.jar artifacts/ServerWrapper.jar
+          cp LauncherAuthlib/build/libs/LauncherAuthlib.jar artifacts/LauncherAuthlib.jar
           cp modules/*_module/build/libs/*.jar artifacts/modules || true
           cp modules/*_lmodule/build/libs/*.jar artifacts/modules || true
 
@@ -55,10 +53,11 @@ jobs:
         if: startsWith(github.event.ref, 'refs/tags')
         run: |
           cd artifacts
-          zip -9 LauncherBase.zip libraries.zip LaunchServer.jar
+          zip -r -9 Release.zip *
           zip -j -9 LaunchServerModules.zip ../modules/*_module/build/libs/*.jar
           zip -j -9 LauncherModules.zip ../modules/*_lmodule/build/libs/*.jar
-          zip -j -9 ServerWrapperModules.zip ../modules/*_swmodule/build/libs/*.jar || true
+          cd ../LaunchServer/build/libs
+          zip -r -9 ../../../artifacts/LauncherBase.zip * -x "LaunchServer-clean.jar"
 
       - name: Create release
         id: create_release
@@ -73,4 +72,4 @@ jobs:
           draft: false
           prerelease: false
           files: |
-            artifacts/*
\ No newline at end of file
+            artifacts/*