added ios/macos templates as well as a missing web template.

blazium-engine · Dec 10, 2024 · d845200 · d845200
1 parent 2896462
commit d845200
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 8 deletions.
diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml
@@ -239,11 +239,10 @@ jobs:
           cp "./ios/${{ github.event.client_payload.type || 'nightly' }}/templates/libgodot.ios.debug.a" ios_xcode/libgodot.ios.debug.xcframework/ios-arm64/libgodot.a
           cp -r deps/moltenvk/MoltenVK/MoltenVK.xcframework ios_xcode/
           rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}*
-          tar -czvf ${{ matrix.cache-name }}-${{ github.event.client_payload.type || 'nightly' }}.tar.gz -C ./ios_xcode .
           cd ios_xcode
-          zip -q -9 -r "${HERE}/ios.zip" *
+          zip -q -9 -r "${HERE}/${{ matrix.cache-name }}-${{ github.event.client_payload.type || 'nightly' }}.zip" *
           cd "${HERE}"
-          rm -rf ios_xcode
+          tar -czvf ${{ matrix.cache-name }}-${{ github.event.client_payload.type || 'nightly' }}.tar.gz ${{ matrix.cache-name }}-${{ github.event.client_payload.type || 'nightly' }}.zip
 
       - uses: BetaHuhn/do-spaces-action@v2
         with:

diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
@@ -538,7 +538,8 @@ jobs:
           chmod +x Blazium${MONO_SUFFIX}.app/Contents/MacOS/blazium*
 
           # Package the application into a zip file
-          zip -q -9 -r "Blazium_macos.universal${MONO_SUFFIX}.zip" Blazium${MONO_SUFFIX}.app
+          zip -q -9 -r "${{ matrix.cache-name }}-${{ github.event.client_payload.type || 'nightly' }}.zip" Blazium${MONO_SUFFIX}.app
+          
       
       - name: Create tar.gz Archive
         run: |
@@ -549,7 +550,7 @@ jobs:
             MONO_SUFFIX="_mono"
           fi
 
-          tar -czvf ${{ matrix.cache-name }}-${{ github.event.client_payload.type || 'nightly' }}.tar.gz ./Blazium_macos.universal${MONO_SUFFIX}.zip
+          tar -czvf ${{ matrix.cache-name }}-${{ github.event.client_payload.type || 'nightly' }}.tar.gz ./${{ matrix.cache-name }}-${{ github.event.client_payload.type || 'nightly' }}.zip
 
       - uses: BetaHuhn/do-spaces-action@v2
         with:

diff --git a/.github/workflows/template_deploy.yml b/.github/workflows/template_deploy.yml
@@ -25,9 +25,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-monoglue:
+  deploy-templates:
     runs-on: "ubuntu-20.04"
-    name: Example for Template Deploy
+    name: Template Deploy
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -123,7 +123,7 @@ jobs:
             blazium.web.template_release.wasm32.zip
             blazium.web.template_debug.wasm32.zip
             blazium.web.template_release.wasm32.nothreads.zip
-            blazium.template_debug.wasm32.nothreads.zip
+            blazium.web.template_debug.wasm32.nothreads.zip
             blazium.web.template_release.wasm32.dlink.zip
             blazium.web.template_debug.wasm32.dlink.zip
             blazium.web.template_release.wasm32.nothreads.dlink.zip
@@ -248,6 +248,36 @@ jobs:
           input_dir: ${{ github.workspace }}/extracted
           output_dir: ${{ github.workspace }}/templates/mono
 
+      - name: Copy & Rename MacOS/iOS Templates
+        uses: ./.github/actions/multi-copy-rename
+        with:
+          names: |
+            macos-template-${{ github.event.client_payload.type || 'nightly' }}
+            ios-template-${{ github.event.client_payload.type || 'nightly' }}
+          filename_old: |
+            macos-template-${{ github.event.client_payload.type || 'nightly' }}.zip
+            ios-template-${{ github.event.client_payload.type || 'nightly' }}.zip
+          filename_new: |
+            macos.zip
+            ios.zip
+          input_dir: ${{ github.workspace }}/extracted
+          output_dir: ${{ github.workspace }}/templates
+
+      - name: Copy & Rename MacOS/iOS Templates (mono)
+        uses: ./.github/actions/multi-copy-rename
+        with:
+          names: |
+            macos-template-mono-${{ github.event.client_payload.type || 'nightly' }}
+            ios-template-mono-${{ github.event.client_payload.type || 'nightly' }}
+          filename_old: |
+            macos-template-mono-${{ github.event.client_payload.type || 'nightly' }}.zip
+            ios-template-mono-${{ github.event.client_payload.type || 'nightly' }}.zip
+          filename_new: |
+            macos.zip
+            ios.zip
+          input_dir: ${{ github.workspace }}/extracted
+          output_dir: ${{ github.workspace }}/templates/mono
+
       - name: List Templates Directory
         shell: bash
         run: |