From 804ad4ad0bf312661edcfc68d4f64efa2899563c Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Tue, 17 Jan 2023 13:52:32 +0100 Subject: [PATCH 1/5] Try to figure out where the new install location for Godot binaries is on GH. --- .github/workflows/spine-godot.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/spine-godot.yml b/.github/workflows/spine-godot.yml index 051de94cf..f12ee8c12 100644 --- a/.github/workflows/spine-godot.yml +++ b/.github/workflows/spine-godot.yml @@ -33,6 +33,7 @@ jobs: run: | ./spine-godot/build/setup.sh $GODOT_TAG false ./spine-godot/build/build.sh release_debug + ls spine-godot/godot/bin/ - name: Upload artifacts uses: actions/upload-artifact@v2 @@ -57,6 +58,7 @@ jobs: sudo apt-get install build-essential scons pkg-config libx11-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev ./spine-godot/build/setup.sh $GODOT_TAG false ./spine-godot/build/build.sh release_debug + ls spine-godot/godot/bin/ - name: Upload artifacts uses: actions/upload-artifact@v2 @@ -82,6 +84,7 @@ jobs: pushd spine-godot/godot/bin zip -r godot-editor-macos.zip Godot.app popd + ls spine-godot/godot/bin/ - name: Upload artifacts uses: actions/upload-artifact@v2 From fac881b11bfbe2b10ac6a63f1175116ba3ea56c8 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Tue, 17 Jan 2023 18:37:56 +0100 Subject: [PATCH 2/5] [godot] Fix executable paths for GH action. --- .github/workflows/spine-godot.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/spine-godot.yml b/.github/workflows/spine-godot.yml index f12ee8c12..ec0d2805e 100644 --- a/.github/workflows/spine-godot.yml +++ b/.github/workflows/spine-godot.yml @@ -32,14 +32,13 @@ jobs: shell: bash run: | ./spine-godot/build/setup.sh $GODOT_TAG false - ./spine-godot/build/build.sh release_debug - ls spine-godot/godot/bin/ + ./spine-godot/build/build.sh release_debug - name: Upload artifacts uses: actions/upload-artifact@v2 with: name: godot-editor-windows.zip - path: spine-godot/godot/bin/godot.windows.opt.tools.64.exe + path: spine-godot/godot/bin\godot.windows.opt.tools.64.s.exe godot-editor-linux: runs-on: ubuntu-latest @@ -57,14 +56,13 @@ jobs: sudo apt-get update sudo apt-get install build-essential scons pkg-config libx11-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev ./spine-godot/build/setup.sh $GODOT_TAG false - ./spine-godot/build/build.sh release_debug - ls spine-godot/godot/bin/ + ./spine-godot/build/build.sh release_debug - name: Upload artifacts uses: actions/upload-artifact@v2 with: name: godot-editor-linux.zip - path: spine-godot/godot/bin/godot.x11.opt.tools.64 + path: spine-godot/godot/bin/godot.x11.opt.tools.64s godot-editor-macos: runs-on: macos-latest @@ -83,8 +81,7 @@ jobs: ./spine-godot/build/build.sh release_debug pushd spine-godot/godot/bin zip -r godot-editor-macos.zip Godot.app - popd - ls spine-godot/godot/bin/ + popd - name: Upload artifacts uses: actions/upload-artifact@v2 From 341217ad6f6c34d99c257a7a0e2e2b74e8200886 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 18 Jan 2023 09:40:32 +0100 Subject: [PATCH 3/5] [godot] Fix S3 upload. --- .github/workflows/spine-godot.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/spine-godot.yml b/.github/workflows/spine-godot.yml index ec0d2805e..bd7574250 100644 --- a/.github/workflows/spine-godot.yml +++ b/.github/workflows/spine-godot.yml @@ -38,7 +38,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: godot-editor-windows.zip - path: spine-godot/godot/bin\godot.windows.opt.tools.64.s.exe + path: spine-godot/godot/bin/godot.windows.opt.tools.64.s.exe godot-editor-linux: runs-on: ubuntu-latest @@ -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/ From 5ae7b307fa87f5ac12f8ade7999dd268cee5d6f5 Mon Sep 17 00:00:00 2001 From: badlogic Date: Tue, 24 Jan 2023 10:40:23 +0100 Subject: [PATCH 4/5] [godot] Disable address sanitiizer for release builds. --- spine-godot/build/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-godot/build/build.sh b/spine-godot/build/build.sh index b56bda44f..52b231929 100755 --- a/spine-godot/build/build.sh +++ b/spine-godot/build/build.sh @@ -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 From ca09a57c21644a34c88f18943cf92fe9f7ab8fd6 Mon Sep 17 00:00:00 2001 From: badlogic Date: Tue, 24 Jan 2023 10:58:42 +0100 Subject: [PATCH 5/5] [godot] Fix exectuable names expected in GitHub workflow. --- .github/workflows/spine-godot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/spine-godot.yml b/.github/workflows/spine-godot.yml index bd7574250..6755d8c82 100644 --- a/.github/workflows/spine-godot.yml +++ b/.github/workflows/spine-godot.yml @@ -38,7 +38,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: godot-editor-windows.zip - path: spine-godot/godot/bin/godot.windows.opt.tools.64.s.exe + path: spine-godot/godot/bin/godot.windows.opt.tools.64.exe godot-editor-linux: runs-on: ubuntu-latest @@ -62,7 +62,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: godot-editor-linux.zip - path: spine-godot/godot/bin/godot.x11.opt.tools.64s + path: spine-godot/godot/bin/godot.x11.opt.tools.64 godot-editor-macos: runs-on: macos-latest