create zips with skunkcrats config

hotbso · Nov 22, 2024 · 9a1e215 · 9a1e215
1 parent bbbd1ae
commit 9a1e215
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -139,9 +139,7 @@ jobs:
             do
               tar xvf $t
             done
-            bash ./mk_zip.sh
-            ls -l
-            for z in openSAM*.zip; do unzip -t $z; done
+            bash ./sync_xp11_pkg.sh
 
       - name: Prepare Skunkcrafts Updater
         shell: bash
@@ -150,20 +148,24 @@ jobs:
             source version.mak
 
             for XP_VERSION in XP11 XP12; do
-              OPENSAM_ARTIFACT=openSAM_${XP_VERSION}-${VERSION}
-              OPENSAM_FOLDER=release/${XP_VERSION}/openSAM
-              OPENSAM_LIBRARY_FOLDER=release/${XP_VERSION}/openSAM_Library
+              if [ $XP_VERSION == "XP11" ]
+                OPENSAM_ARTIFACT=openSAM-pkg_XP11
+              else
+                OPENSAM_ARTIFACT=openSAM-pkg
+              fi
+
+              RELEASE_FOLDER=release/${XP_VERSION}
+              OPENSAM_FOLDER=$RELEASE_FOLDER/openSAM
+              OPENSAM_LIBRARY_FOLDER=$RELEASE_FOLDER/openSAM_Library
 
               mkdir -p ${OPENSAM_FOLDER}
               mkdir -p ${OPENSAM_FOLDER}/lua
               mkdir -p ${OPENSAM_LIBRARY_FOLDER}
 
-              if [ $XP_VERSION == "XP11" ]; then
-                unzip openSAM_XP11-${VERSION}.zip -d ${OPENSAM_ARTIFACT}
-              else
-                # normalize folder name
-                unzip openSAM-${VERSION}.zip -d ${OPENSAM_ARTIFACT}
-              fi
+              echo "=============== RELEASE FOLDER  ==============="
+              cp -r ${OPENSAM_ARTIFACT}/LICENSE $RELEASE_FOLDER/.
+              cp -r ${OPENSAM_ARTIFACT}/Credits_and_Licensing.txt $RELEASE_FOLDER/.
+              cp -r ${OPENSAM_ARTIFACT}/00_README.txt $RELEASE_FOLDER/.
 
               echo "=============== OPEN SAM ARTIFACT ==============="
               rsync -av  ${OPENSAM_ARTIFACT}/openSAM/ ${OPENSAM_FOLDER}/
@@ -214,8 +216,9 @@ jobs:
 
               touch ${OPENSAM_FOLDER}/skunkcrafts_updater_blacklist.txt
               touch ${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater_blacklist.txt
-            done
 
+              (cd ${RELEASE_FOLDER} && 7z a "../openSAM-${XP_VERSION}-${VERSION}.zip" *)
+            done
 
             # push to release branch
             git checkout -b release
@@ -224,7 +227,7 @@ jobs:
             git add release/
             git commit -m "Release ${VERSION}"
             git push -f -u origin release
-            
+
 
 
 
@@ -235,4 +238,4 @@ jobs:
         with:
           files: |
             ${{ github.workspace }}/openSAM*.zip
-          prerelease: ${{ contains(github.ref_name, '-') }}
+          prerelease: ${{ contains(github.ref_name, '-') }}