From 9da2be9f6fd234087b4ce7fc1142ba3747e8273b Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 25 Jan 2023 13:17:30 +0100 Subject: [PATCH] [godot] Fix web templates build for Godot 4.0 --- .github/workflows/spine-godot-v4.yml | 10 +++++----- spine-godot/build/build-templates-v4.sh | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/spine-godot-v4.yml b/.github/workflows/spine-godot-v4.yml index c85dd288d..71786aee1 100644 --- a/.github/workflows/spine-godot-v4.yml +++ b/.github/workflows/spine-godot-v4.yml @@ -262,13 +262,13 @@ jobs: uses: actions/upload-artifact@v2 with: name: godot-template-web-debug.zip - path: spine-godot/godot/bin/webassembly_debug.zip + path: spine-godot/godot/bin/web_debug.zip - name: Upload artifacts release uses: actions/upload-artifact@v2 with: name: godot-template-web-release.zip - path: spine-godot/godot/bin/webassembly_release.zip + path: spine-godot/godot/bin/web_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] @@ -350,8 +350,8 @@ jobs: run: | BRANCH=${GITHUB_REF#refs/heads/} echo "branch: $BRANCH" - mv godot.windows.opt.tools.64.exe godot-$BRANCH-$GODOT_TAG.exe - mv godot.x11.opt.tools.64 godot-$BRANCH-$GODOT_TAG + mv godot.windows.editor.x86_64.exe godot-$BRANCH-$GODOT_TAG.exe + mv godot.linux.editor.x86_64 godot-$BRANCH-$GODOT_TAG zip godot-editor-windows.zip godot-$BRANCH-$GODOT_TAG.exe zip godot-editor-linux.zip godot-$BRANCH-$GODOT_TAG aws s3 cp godot-editor-windows.zip s3://spine-godot/$BRANCH/$GODOT_TAG/ @@ -359,7 +359,7 @@ jobs: aws s3 cp godot-editor-macos.zip s3://spine-godot/$BRANCH/$GODOT_TAG/ echo "$GODOT_VERSION" > version.txt ls -lah - zip spine-godot-templates-$BRANCH-$GODOT_TAG.zip ios.zip macos.zip windows_64_debug.exe windows_64_release.exe linux_x11_64_debug linux_x11_64_release webassembly_debug.zip webassembly_release.zip android_release.apk android_debug.apk android_source.zip version.txt + zip spine-godot-templates-$BRANCH-$GODOT_TAG.zip ios.zip macos.zip windows_64_debug.exe windows_64_release.exe linux_x11_64_debug linux_x11_64_release web_debug.zip web_release.zip android_release.apk android_debug.apk android_source.zip version.txt aws s3 cp spine-godot-templates-$BRANCH-$GODOT_TAG.zip s3://spine-godot/$BRANCH/$GODOT_TAG/spine-godot-templates-$BRANCH-$GODOT_TAG.tpz diff --git a/spine-godot/build/build-templates-v4.sh b/spine-godot/build/build-templates-v4.sh index 1118d70bb..adae77e93 100755 --- a/spine-godot/build/build-templates-v4.sh +++ b/spine-godot/build/build-templates-v4.sh @@ -93,10 +93,10 @@ elif [ "$platform" = "ios" ]; then elif [ "$platform" = "web" ]; then # --- WEB --- # generates webassembly_debug.zip, webassembly_release.zip - scons platform=javascript tools=no target=template_release custom_modules="../spine_godot" --jobs=$cpus - scons platform=javascript tools=no target=template_debug custom_modules="../spine_godot" --jobs=$cpus - mv bin/godot.javascript.opt.zip bin/webassembly_release.zip - mv bin/godot.javascript.opt.debug.zip bin/webassembly_debug.zip + scons platform=web tools=no target=template_release custom_modules="../spine_godot" --jobs=$cpus + 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 elif [ "$platform" = "android" ]; then # --- ANROID --- # generates android_release.apk, android_debug.apk, android_source.zip