From 66a9ce0f0fd9faab195d2a8993dfd6d3a2c65e13 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 18 Sep 2024 14:13:41 +0200 Subject: [PATCH] [godot] Build additional web templates (nothreads, dlink), closes #2627 --- .github/workflows/spine-godot-v4.yml | 68 ++++++++++++++++++++++++- spine-godot/build/build-templates-v4.sh | 12 +++++ 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/.github/workflows/spine-godot-v4.yml b/.github/workflows/spine-godot-v4.yml index 75b93af55..20a56aacc 100644 --- a/.github/workflows/spine-godot-v4.yml +++ b/.github/workflows/spine-godot-v4.yml @@ -34,7 +34,7 @@ env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_EC2_METADATA_DISABLED: true - EM_VERSION: 3.1.18 + EM_VERSION: 3.1.26 GODOT_TAG: ${{ inputs.godot_tag }} GODOT_VERSION: ${{ inputs.godot_version }} GODOT_MONO: ${{ inputs.godot_mono }} @@ -302,6 +302,42 @@ jobs: name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} path: spine-godot/godot/bin/web_release.zip + - name: Upload artifacts no threads debug + uses: actions/upload-artifact@v3 + with: + name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-nothreads-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} + path: spine-godot/godot/bin/web_nothreads_debug.zip + + - name: Upload artifacts no threads release + uses: actions/upload-artifact@v3 + with: + name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-nothreads-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} + path: spine-godot/godot/bin/web_nothreads_release.zip + + - name: Upload artifacts dlink debug + uses: actions/upload-artifact@v3 + with: + name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-dlink-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} + path: spine-godot/godot/bin/web_dlink_debug.zip + + - name: Upload artifacts dlink release + uses: actions/upload-artifact@v3 + with: + name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-dlink-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} + path: spine-godot/godot/bin/web_dlink_release.zip + + - name: Upload artifacts dlink nothreads debug + uses: actions/upload-artifact@v3 + with: + name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-dlink-nothreads-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} + path: spine-godot/godot/bin/web_dlink_nothreads_debug.zip + + - name: Upload artifacts dlink nothreads release + uses: actions/upload-artifact@v3 + with: + name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-dlink-nothreads-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} + path: spine-godot/godot/bin/web_dlink_nothreads_release.zip + upload-to-s3: needs: [godot-editor-windows, godot-editor-linux, godot-editor-macos, godot-template-ios, godot-template-macos, godot-template-windows, godot-template-linux, godot-template-android, godot-template-web] runs-on: ubuntu-latest @@ -378,6 +414,36 @@ jobs: with: name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} + - name: Download godot-template-web-nothreads-release artifact + uses: actions/download-artifact@v2 + with: + name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-nothreads-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} + + - name: Download godot-template-web-nothreads-debug artifact + uses: actions/download-artifact@v2 + with: + name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-nothreads-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} + + - name: Download godot-template-web-dlink-release artifact + uses: actions/download-artifact@v2 + with: + name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-dlink-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} + + - name: Download godot-template-web-dlink-debug artifact + uses: actions/download-artifact@v2 + with: + name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-dlink-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} + + - name: Download godot-template-web-dlink-nothreads-release artifact + uses: actions/download-artifact@v2 + with: + name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-dlink-nothreads-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} + + - name: Download godot-template-web-dlink-nothreads-debug artifact + uses: actions/download-artifact@v2 + with: + name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-dlink-nothreads-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }} + - name: Upload artifacts to S3 shell: bash if: env.AWS_ACCESS_KEY_ID != null diff --git a/spine-godot/build/build-templates-v4.sh b/spine-godot/build/build-templates-v4.sh index 60d109238..449a572a2 100755 --- a/spine-godot/build/build-templates-v4.sh +++ b/spine-godot/build/build-templates-v4.sh @@ -132,6 +132,18 @@ elif [ "$platform" = "web" ]; then scons platform=web tools=no target=template_debug custom_modules="../spine_godot" --jobs=$cpus mv bin/godot.web.template_release.wasm32.zip bin/web_release.zip mv bin/godot.web.template_debug.wasm32.zip bin/web_debug.zip + scons platform=web tools=no threads=no target=template_release custom_modules="../spine_godot" --jobs=$cpus + scons platform=web tools=no threads=no target=template_debug custom_modules="../spine_godot" --jobs=$cpus + mv bin/godot.web.template_release.wasm32.zip bin/web_nothreads_release.zip + mv bin/godot.web.template_debug.wasm32.zip bin/web_nothreads_debug.zip + scons platform=web tools=no dlink_enabled=yes target=template_release custom_modules="../spine_godot" --jobs=$cpus + scons platform=web tools=no dlink_enabled=yes target=template_debug custom_modules="../spine_godot" --jobs=$cpus + mv bin/godot.web.template_release.wasm32.dlink.zip bin/web_dlink_release.zip + mv bin/godot.web.template_debug.wasm32.dlink.zip bin/web_dlink_debug.zip + scons platform=web tools=no threads=no dlink_enabled=yes target=template_release custom_modules="../spine_godot" --jobs=$cpus + scons platform=web tools=no threads=no dlink_enabled=yes target=template_debug custom_modules="../spine_godot" --jobs=$cpus + mv bin/godot.web.template_release.wasm32.dlink.zip bin/web_dlink_nothreads_release.zip + mv bin/godot.web.template_debug.wasm32.dlink.zip bin/web_dlink_nothreads_debug.zip elif [ "$platform" = "android" ]; then # --- ANROID --- # generates android_release.apk, android_debug.apk, android_source.zip