From 3c94e429cc818660b9159d92dbe0ec9a5cb82b9c Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Mon, 16 Jan 2023 14:03:34 +0100 Subject: [PATCH 1/3] [godot] Update action to ubuntu-latest for Linux to fix GCC sanitizer support. --- .github/workflows/spine-godot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spine-godot.yml b/.github/workflows/spine-godot.yml index 0f9d23e68..051de94cf 100644 --- a/.github/workflows/spine-godot.yml +++ b/.github/workflows/spine-godot.yml @@ -41,7 +41,7 @@ jobs: path: spine-godot/godot/bin/godot.windows.opt.tools.64.exe godot-editor-linux: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: From 6081af6af0e1a260db2b47fad4c3e7f8e9ae3078 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Mon, 16 Jan 2023 14:13:55 +0100 Subject: [PATCH 2/3] Try to fix dotnet-format on GH. --- .github/workflows/format-check.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index 9635b5890..ab79f8dc7 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -1,7 +1,8 @@ name: Check format on: - push: + push: + workflow_dispatch: jobs: build: @@ -51,7 +52,8 @@ jobs: - name: Format run: | export CLANGFORMAT=`pwd`/clang/bin/clang-format - export PATH="$PATH:/root/.dotnet/tools" + export PATH="$PATH:/root/.dotnet/tools" + dotnet-format --version ./formatters/format.sh find . -type f -name '*.cs' -exec perl -pi -e 's/\r\n/\n/g' '{}' + git diff From 7f4f32453ba0714ec91559a6690c6fd2ae6fad85 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Mon, 16 Jan 2023 14:49:12 +0100 Subject: [PATCH 3/3] [csharp] Fix formatting. --- .../Runtime/spine-unity/Asset Types/SpineSpriteAtlasAsset.cs | 2 +- .../spine-unity/Components/Following/BoundingBoxFollower.cs | 2 +- .../Components/Following/BoundingBoxFollowerGraphic.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SpineSpriteAtlasAsset.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SpineSpriteAtlasAsset.cs index ed8cf1ef3..a889d30c2 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SpineSpriteAtlasAsset.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SpineSpriteAtlasAsset.cs @@ -183,7 +183,7 @@ namespace Spine.Unity { texture = AccessPackedTextureEditor(spriteAtlas); else #endif - texture = AccessPackedTexture(sprites); + texture = AccessPackedTexture(sprites); Material material = materials[0]; #if !UNITY_EDITOR diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollower.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollower.cs index a274975a3..542d0b43b 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollower.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollower.cs @@ -204,7 +204,7 @@ namespace Spine.Unity { DestroyImmediate(collider); else #endif - Destroy(collider); + Destroy(collider); } } } diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollowerGraphic.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollowerGraphic.cs index d01069d27..886bbd942 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollowerGraphic.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoundingBoxFollowerGraphic.cs @@ -208,7 +208,7 @@ namespace Spine.Unity { DestroyImmediate(collider); else #endif - Destroy(collider); + Destroy(collider); } } }