Fix Godot GH actions

EsotericSoftware · Oct 17, 2024 · 0954267 · 0954267
1 parent 5b15994
commit 0954267
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 33 deletions.
diff --git a/.github/workflows/spine-godot-v4.yml b/.github/workflows/spine-godot-v4.yml
@@ -59,7 +59,7 @@ jobs:
           ./spine-godot/build/build-v4.sh $GODOT_MONO
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-editor-windows', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/**/*
@@ -83,7 +83,7 @@ jobs:
           ./spine-godot/build/build-v4.sh $GODOT_MONO
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-editor-linux', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/**/*
@@ -109,7 +109,7 @@ jobs:
           popd
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-editor-macos', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/godot-editor-macos.zip
@@ -133,7 +133,7 @@ jobs:
           ./spine-godot/build/build-templates-v4.sh ios
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-ios', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/ios.zip
@@ -155,7 +155,7 @@ jobs:
           ./spine-godot/build/build-templates-v4.sh macos $GODOT_MONO
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-macos', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/macos.zip
@@ -178,13 +178,13 @@ jobs:
           ./spine-godot/build/build-templates-v4.sh linux $GODOT_MONO
 
       - name: Upload artifacts debug
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-linux-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/linux_debug.x86_64
 
       - name: Upload artifacts release
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-linux-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/linux_release.x86_64
@@ -206,13 +206,13 @@ jobs:
           ./spine-godot/build/build-templates-v4.sh windows $GODOT_MONO
 
       - name: Upload artifacts debug
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-windows-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/windows_debug_x86_64.exe
 
       - name: Upload artifacts release
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-windows-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/windows_release_x86_64.exe
@@ -247,19 +247,19 @@ jobs:
           ./spine-godot/build/build-templates-v4.sh android
 
       - name: Upload artifacts debug
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-android-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/android_debug.apk
 
       - name: Upload artifacts release
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-android-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/android_release.apk
 
       - name: Upload artifacts source
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-android-source', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/android_source.zip
@@ -291,49 +291,49 @@ jobs:
           ./spine-godot/build/build-templates-v4.sh web
 
       - name: Upload artifacts debug
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/web_debug.zip
 
       - name: Upload artifacts release
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/web_release.zip
 
       - name: Upload artifacts no threads debug
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-nothreads-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/web_nothreads_debug.zip
 
       - name: Upload artifacts no threads release
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-nothreads-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/web_nothreads_release.zip
 
       - name: Upload artifacts dlink debug
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-dlink-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/web_dlink_debug.zip
 
       - name: Upload artifacts dlink release
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-dlink-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/web_dlink_release.zip
 
       - name: Upload artifacts dlink nothreads debug
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-dlink-nothreads-debug', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/web_dlink_nothreads_debug.zip
 
       - name: Upload artifacts dlink nothreads release
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('{0}-{1}{2}.zip', 'godot-template-web-dlink-nothreads-release', env.GODOT_TAG, env.GODOT_MONO_UPLOAD_SUFFIX) }}
           path: spine-godot/godot/bin/web_dlink_nothreads_release.zip

diff --git a/spine-godot/spine_godot/SpineAtlasResource.h b/spine-godot/spine_godot/SpineAtlasResource.h
@@ -103,7 +103,7 @@ class SpineAtlasResourceFormatLoader : public ResourceFormatLoader {
 
 public:
 #ifdef SPINE_GODOT_EXTENSION
-	static void _bind_methods() {};
+	static void _bind_methods(){};
 
 	PackedStringArray _get_recognized_extensions();
 
@@ -136,7 +136,7 @@ class SpineAtlasResourceFormatSaver : public ResourceFormatSaver {
 
 public:
 #ifdef SPINE_GODOT_EXTENSION
-	static void _bind_methods() {};
+	static void _bind_methods(){};
 
 	Error _save(const Ref<Resource> &resource, const String &path, uint32_t flags) override;
 

diff --git a/spine-godot/spine_godot/SpineBoneNode.cpp b/spine-godot/spine_godot/SpineBoneNode.cpp
@@ -227,11 +227,11 @@ void SpineBoneNode::draw() {
 	if (bone_length == 0) {
 		draw_circle(Vector2(0, 0), debug_thickness, debug_color);
 	} else {
-		#ifdef SPINE_GODOT_EXTENSION
+#ifdef SPINE_GODOT_EXTENSION
 		PackedVector2Array points;
-		#else
+#else
 		Vector<Vector2> points;
-		#endif
+#endif
 		points.push_back(Vector2(-debug_thickness, 0));
 		points.push_back(Vector2(0, debug_thickness));
 		points.push_back(Vector2(bone_length, 0));

diff --git a/spine-godot/spine_godot/SpineEditorPlugin.h b/spine-godot/spine_godot/SpineEditorPlugin.h
@@ -53,7 +53,7 @@ class SpineAtlasResourceImportPlugin : public EditorImportPlugin {
 
 public:
 #ifdef SPINE_GODOT_EXTENSION
-	static void _bind_methods() {};
+	static void _bind_methods(){};
 
 	String _get_importer_name() const override { return "spine.atlas"; }
 
@@ -124,7 +124,7 @@ class SpineJsonResourceImportPlugin : public EditorImportPlugin {
 
 public:
 #ifdef SPINE_GODOT_EXTENSION
-	static void _bind_methods() {};
+	static void _bind_methods(){};
 
 	String _get_importer_name() const override { return "spine.json"; }
 
@@ -198,7 +198,7 @@ class SpineBinaryResourceImportPlugin : public EditorImportPlugin {
 
 public:
 #ifdef SPINE_GODOT_EXTENSION
-	static void _bind_methods() {};
+	static void _bind_methods(){};
 
 	String _get_importer_name() const override { return "spine.skel"; }
 

diff --git a/spine-godot/spine_godot/SpineSkeletonFileResource.h b/spine-godot/spine_godot/SpineSkeletonFileResource.h
@@ -83,7 +83,7 @@ class SpineSkeletonFileResourceFormatLoader : public ResourceFormatLoader {
 
 public:
 #ifdef SPINE_GODOT_EXTENSION
-	static void _bind_methods() {};
+	static void _bind_methods(){};
 
 	PackedStringArray _get_recognized_extensions();
 
@@ -116,7 +116,7 @@ class SpineSkeletonFileResourceFormatSaver : public ResourceFormatSaver {
 
 public:
 #ifdef SPINE_GODOT_EXTENSION
-	static void _bind_methods() {};
+	static void _bind_methods(){};
 
 	Error _save(const Ref<Resource> &resource, const String &path, uint32_t flags) override;
 

diff --git a/spine-godot/spine_godot/SpineSprite.cpp b/spine-godot/spine_godot/SpineSprite.cpp
@@ -237,7 +237,7 @@ void SpineMesh2D::update_mesh(const PackedVector2Array &vertices,
 		arrays[Mesh::ARRAY_INDEX] = indices;
 		RS::get_singleton()->mesh_add_surface_from_arrays(mesh, RS::PrimitiveType::PRIMITIVE_TRIANGLES, arrays, Array(), Dictionary(), RS::ArrayFormat::ARRAY_FLAG_USE_DYNAMIC_UPDATE);
 		Dictionary surface = RS::get_singleton()->mesh_get_surface(mesh, 0);
-		RS::ArrayFormat surface_format = (RS::ArrayFormat)static_cast<int64_t>(surface["format"]);
+		RS::ArrayFormat surface_format = (RS::ArrayFormat) static_cast<int64_t>(surface["format"]);
 		surface_offsets[RS::ARRAY_VERTEX] = RS::get_singleton()->mesh_surface_get_format_offset(surface_format, vertices.size(), RS::ARRAY_VERTEX);
 		surface_offsets[RS::ARRAY_COLOR] = RS::get_singleton()->mesh_surface_get_format_offset(surface_format, vertices.size(), RS::ARRAY_COLOR);
 		surface_offsets[RS::ARRAY_TEX_UV] = RS::get_singleton()->mesh_surface_get_format_offset(surface_format, vertices.size(), RS::ARRAY_TEX_UV);

diff --git a/spine-godot/spine_godot/SpineSprite.h b/spine-godot/spine_godot/SpineSprite.h
@@ -96,7 +96,7 @@ class SpineMesh2D : public Node2D {
 
 public:
 #if VERSION_MAJOR > 3
-	SpineMesh2D() : renderer_object(nullptr), indices_changed(true), num_vertices(0), num_indices(0), vertex_stride(0), normal_tangent_stride(0), attribute_stride(0) {};
+	SpineMesh2D() : renderer_object(nullptr), indices_changed(true), num_vertices(0), num_indices(0), vertex_stride(0), normal_tangent_stride(0), attribute_stride(0){};
 	~SpineMesh2D() {
 		if (mesh.is_valid()) {
 #ifdef SPINE_GODOT_EXTENSION
@@ -107,7 +107,7 @@ class SpineMesh2D : public Node2D {
 		}
 	}
 #else
-	SpineMesh2D() : renderer_object(nullptr), indices_changed(true), num_vertices(0), num_indices(0) {};
+	SpineMesh2D() : renderer_object(nullptr), indices_changed(true), num_vertices(0), num_indices(0){};
 	~SpineMesh2D() {
 		if (mesh.is_valid()) {
 			VS::get_singleton()->free(mesh);