Troubleshooting release action

Ne0nd0g · Nov 5, 2023 · cda117d · cda117d
1 parent 129138f
commit cda117d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -85,10 +85,13 @@ jobs:
         id: package_release
         working-directory: /home/runner/work/merlin/merlin
         run: |
+          VERSION=$(cat pkg/merlin.go |grep "const Version ="|cut -d"\"" -f2)
+          BUILD=$(git rev-parse HEAD)
+          DIR=data/temp/v${VERSION}/${BUILD}
           F="README.MD LICENSE data/modules docs data/README.MD data/agents/README.MD data/log/README.MD data/x509 data/src data/bin"
-          7za a -pmerlin -mhe -mx=9 merlinServer-Linux-x64.7z $F merlinCLI-Linux-x64 merlinServer-Linux-x64
-          7za a -pmerlin -mhe -mx=9 $TEMP/merlinServer-Darwin-x64.7z $F $TEMP/merlinServer-Darwin-x64
-          7za a -pmerlin -mhe -mx=9 $TEMP/merlinServer-Windows-x64.7z $F $TEMP/merlinServer-Windows-x64.exe
+          7za a -pmerlin -mhe -mx=9 merlinServer-Linux-x64.7z $F $DIR/merlinServer-Linux-x64
+          7za a -pmerlin -mhe -mx=9 merlinServer-Darwin-x64.7z $F $DIR/merlinServer-Darwin-x64
+          7za a -pmerlin -mhe -mx=9 $TEMP/merlinServer-Windows-x64.7z $F $DIR/merlinServer-Windows-x64.exe
 
       - name: Create Draft Release
         id: create_draft_release