[godot] Fix Linux editor and template build for Godot 4.0

This commit is contained in:
Mario Zechner 2023-01-25 13:39:56 +01:00
parent 9e5c945d17
commit ffa028626a
3 changed files with 13 additions and 13 deletions

View File

@ -62,7 +62,7 @@ jobs:
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: godot-editor-linux.zip name: godot-editor-linux.zip
path: spine-godot/godot/bin/godot.linux.editor.x86_64 path: spine-godot/godot/bin/godot.linuxbsd.editor.x86_64
godot-editor-macos: godot-editor-macos:
runs-on: macos-latest runs-on: macos-latest
@ -351,7 +351,7 @@ jobs:
BRANCH=${GITHUB_REF#refs/heads/} BRANCH=${GITHUB_REF#refs/heads/}
echo "branch: $BRANCH" echo "branch: $BRANCH"
mv godot.windows.editor.x86_64.exe godot-$BRANCH-$GODOT_TAG.exe mv godot.windows.editor.x86_64.exe godot-$BRANCH-$GODOT_TAG.exe
mv godot.linux.editor.x86_64 godot-$BRANCH-$GODOT_TAG mv godot.linuxbsd.editor.x86_64 godot-$BRANCH-$GODOT_TAG
zip godot-editor-windows.zip godot-$BRANCH-$GODOT_TAG.exe zip godot-editor-windows.zip godot-$BRANCH-$GODOT_TAG.exe
zip godot-editor-linux.zip godot-$BRANCH-$GODOT_TAG zip godot-editor-linux.zip godot-$BRANCH-$GODOT_TAG
aws s3 cp godot-editor-windows.zip s3://spine-godot/$BRANCH/$GODOT_TAG/ aws s3 cp godot-editor-windows.zip s3://spine-godot/$BRANCH/$GODOT_TAG/

View File

@ -110,16 +110,16 @@ elif [ "$platform" = "android" ]; then
./gradlew generateGodotTemplates ./gradlew generateGodotTemplates
popd popd
elif [ "$platform" = "linux" ]; then elif [ "$platform" = "linux" ]; then
# --- Linix --- # --- Linux ---
# generates linux_x11_64_release, linux_x11_64_debug # generates linux_x11_64_release, linux_x11_64_debug
scons platform=linuxbsd tools=no target=template_release bits=64 custom_modules="../spine_godot" --jobs=$cpus scons platform=linuxbsd tools=no target=template_release bits=64 custom_modules="../spine_godot" --jobs=$cpus
scons platform=linuxbsd tools=no target=template_debug bits=64 custom_modules="../spine_godot" --jobs=$cpus scons platform=linuxbsd tools=no target=template_debug bits=64 custom_modules="../spine_godot" --jobs=$cpus
strip bin/godot.x11.opt.64 strip bin/godot.linuxbsd.template_release.64
strip bin/godot.x11.opt.debug.64 strip bin/godot.linuxbsd.template_debug.64
chmod a+x bin/godot.x11.opt.64 chmod a+x bin/godot.linuxbsd.template_release.64
chmod a+x bin/godot.x11.opt.debug.64 chmod a+x bin/godot.linuxbsd.template_debug.64
cp bin/godot.x11.opt.64 bin/linux_x11_64_release cp bin/godot.linuxbsd.template_release.64 bin/linux_x11_64_release
cp bin/godot.x11.opt.debug.64 bin/linux_x11_64_debug cp bin/godot.linuxbsd.template_debug.64 bin/linux_x11_64_debug
else else
echo "Unknown platform: $platform" echo "Unknown platform: $platform"
exit 1 exit 1

View File

@ -49,9 +49,9 @@ else
fi fi
scons $target compiledb=yes custom_modules="../spine_godot" --jobs=$cpus scons $target compiledb=yes custom_modules="../spine_godot" --jobs=$cpus
cp compile_commands.json ../build cp compile_commands.json ../build
if [ -f "bin/godot.x11.opt.tools.64" ]; then if [ -f "bin/godot.linuxbsd.editor.x86_64" ]; then
strip bin/godot.x11.opt.tools.64 strip bin/godot.linuxbsd.editor.x86_64
chmod a+x bin/godot.x11.opt.tools.64 chmod a+x bin/godot.linuxbsd.editor.x86_64
fi fi
fi fi
popd popd