Merge pull request #118 from gameknife/dev

New Release Script, New sample file
gameknife · Nov 26, 2024 · d8e5acc · d8e5acc
2 parents 6ca1082 + fb17d8b
commit d8e5acc
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 5 deletions.
diff --git a/.github/workflows/release_magicalego.yml b/.github/workflows/release_magicalego.yml
@@ -47,11 +47,8 @@ jobs:
       run: |
         set VULKAN_SDK=C:\VulkanSDK\%SDK_VERSION%
         echo BUILDVER(${{ github.ref_name }}) > src/build.version
-        build_windows_magicalego.bat ${{ github.ref_name }}
+        package_magicalego.bat ${{ github.ref_name }}
       shell: cmd
-    - name: Create zip file
-      run: |
-        package_magicalego.bat
     - name: Upload Release Asset
       uses: actions/upload-release-asset@v1
       env:

diff --git a/assets/legos/diorama.mls b/assets/legos/diorama.mls
diff --git a/assets/legos/diorama1.mls b/assets/legos/diorama1.mls
diff --git a/assets/legos/diorama2.mls b/assets/legos/diorama2.mls
diff --git a/assets/legos/diorama3.mls b/assets/legos/diorama3.mls
diff --git a/assets/legos/shang_025.mls b/assets/legos/shang_025.mls
diff --git a/package_magicalego.bat b/package_magicalego.bat
@@ -9,6 +9,6 @@ popd
 
 pushd %CD%
 cd build/windows
-tar -a -cf "MagicaLego_win64_%1.zip" ./bin/MagicaLego.exe ./bin/ffmpeg.exe ./bin/vulkan-1.dll ./assets/legos ./assets/sfx ./assets/paks ./assets/locale ./assets/fonts ./assets/models/legobricks.glb
+zip -r "MagicaLego_win64_%1.zip" ./bin/MagicaLego.exe ./bin/ffmpeg.exe ./bin/vulkan-1.dll ./assets/legos ./assets/sfx ./assets/paks ./assets/locale ./assets/fonts ./assets/models/legobricks.glb
 move /Y "MagicaLego_win64_%1.zip" ..\..\
 popd