fix github actions

nathanfranke · Aug 8, 2022 · 0046873 · 0046873
1 parent b54b278
commit 0046873
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -96,11 +96,6 @@ jobs:
         run: |
           "$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" "platform-tools" "build-tools;30.0.3" "platforms;android-29" "cmdline-tools;latest" "cmake;3.10.2.4988404" "ndk;21.4.7075529"
 
-          # TODO: Figure out why aarch64-linux-android-ar isn't already included.
-          wget 'https://github.com/urho3d/android-ndk/blob/5f984a348cdaab4c044922c7a154f48d183781bc/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar?raw=true' -O aarch64-linux-android-ar
-          chmod +x aarch64-linux-android-ar
-          mv aarch64-linux-android-ar /usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/
-
       - name: Set up Python
         uses: actions/setup-python@v2
 

diff --git a/src/pathfinding_agent_3d.hpp b/src/pathfinding_agent_3d.hpp
@@ -2,6 +2,7 @@
 
 #include <vector>
 
+#include <godot_cpp/core/class_db.hpp>
 #include <godot_cpp/classes/mesh_instance3d.hpp>
 #include <godot_cpp/classes/node3d.hpp>
 

diff --git a/src/pathfinding_editor_plugin.hpp b/src/pathfinding_editor_plugin.hpp
@@ -2,7 +2,8 @@
 
 #ifdef DEBUG_ENABLED
 
-/*#include <godot_cpp/classes/editor_plugin.hpp>
+/*#include <godot_cpp/core/class_db.hpp>
+#include <godot_cpp/classes/editor_plugin.hpp>
 #include <godot_cpp/classes/control.hpp>
 
 #include "pathfinding_region_3d.hpp"

diff --git a/src/pathfinding_mesh.hpp b/src/pathfinding_mesh.hpp
@@ -3,6 +3,7 @@
 #include <map>
 #include <vector>
 
+#include <godot_cpp/core/class_db.hpp>
 #include <godot_cpp/classes/resource.hpp>
 
 #include "model/pathfinding_cell.hpp"

diff --git a/src/pathfinding_mesh_generator.hpp b/src/pathfinding_mesh_generator.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <godot_cpp/core/class_db.hpp>
 #include <godot_cpp/core/object.hpp>
 #include <godot_cpp/classes/node.hpp>
 

diff --git a/src/pathfinding_region_3d.hpp b/src/pathfinding_region_3d.hpp
@@ -2,12 +2,13 @@
 
 #include <vector>
 
+#include <godot_cpp/core/class_db.hpp>
+#include <godot_cpp/classes/array_mesh.hpp>
 #include <godot_cpp/classes/mesh_instance3d.hpp>
 #include <godot_cpp/classes/node3d.hpp>
 #include <godot_cpp/classes/ref.hpp>
-#include <godot_cpp/templates/vector.hpp>
-#include <godot_cpp/classes/array_mesh.hpp>
 #include <godot_cpp/classes/standard_material3d.hpp>
+#include <godot_cpp/templates/vector.hpp>
 
 #include "pathfinding_mesh.hpp"
 #include "pathfinding_mesh_generator.hpp"

diff --git a/src/pathfinding_server_3d.hpp b/src/pathfinding_server_3d.hpp
@@ -2,12 +2,13 @@
 
 #include <map>
 
+#include <godot_cpp/core/class_db.hpp>
+#include <godot_cpp/core/mutex_lock.hpp>
 #include <godot_cpp/classes/mesh_instance3d.hpp>
 #include <godot_cpp/classes/mutex.hpp>
 #include <godot_cpp/classes/node3d.hpp>
 #include <godot_cpp/classes/object.hpp>
 #include <godot_cpp/classes/thread.hpp>
-#include <godot_cpp/core/mutex_lock.hpp>
 #include <godot_cpp/templates/rid_owner.hpp>
 
 #include "model/pathfinding_agent.hpp"

diff --git a/src/register_types.h b/src/register_types.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <godot_cpp/core/class_db.hpp>
+
 using namespace godot;
 
 void gdextension_initialize(ModuleInitializationLevel p_level);