Merge branch '4.1' into 4.2-beta

This commit is contained in:
badlogic 2023-01-24 11:07:12 +01:00
commit 253dc293db
2 changed files with 6 additions and 6 deletions

View File

@ -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.opt.tools.64.s.exe godot-$BRANCH-$GODOT_TAG.exe
mv godot.x11.opt.tools.64s 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/

View File

@ -60,7 +60,7 @@ else
if [ "$OSTYPE" = "msys" ]; then
target="$target vsproj=yes livepp=$LIVEPP"
fi
scons $target compiledb=yes use_asan=yes custom_modules="../spine_godot" --jobs=$cpus
scons $target compiledb=yes custom_modules="../spine_godot" --jobs=$cpus
if [ -f "bin/godot.x11.opt.tools.64" ]; then
strip bin/godot.x11.opt.tools.64
chmod a+x bin/godot.x11.opt.tools.64