headers: Sync with upstream 3.5 commit 338114d47 (3.5.2-stable)

headers: Sync with upstream 3.5 commit 63d04316d (3.5.1-stable)
Merge pull request #832 from aaronfranke/3.x-ci
2026-01-03 18:09:13 +03:00 · 2023-03-07 09:38:59 +01:00 · 2022-09-28 00:01:34 +02:00 · 2022-09-08 09:47:54 +02:00 · 2022-09-07 22:30:09 -05:00 · 2022-08-07 15:46:39 +02:00
3 changed files with 8 additions and 7 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,8 +14,8 @@ jobs:
            platform: linux
            artifact-name: godot-cpp-linux-glibc2.27-x86_64-release
            artifact-path: bin/libgodot-cpp.linux.release.64.a
-            godot_zip: Godot_v3.4-stable_linux_server.64.zip
-            executable: Godot_v3.4-stable_linux_server.64
+            godot_zip: Godot_v3.5-stable_linux_server.64.zip
+            executable: Godot_v3.5-stable_linux_server.64

          - name: 🏁 Windows (x86_64, MSVC)
            os: windows-2019
@@ -36,7 +36,7 @@ jobs:
            artifact-name: godot-cpp-macos-universal-release
            artifact-path: bin/libgodot-cpp.osx.release.64.a
            flags: macos_arch=universal
-            godot_zip: Godot_v3.4-stable_osx.universal.zip
+            godot_zip: Godot_v3.5-stable_osx.universal.zip
            executable: Godot.app/Contents/MacOS/Godot

          - name: 🤖 Android (arm64)
@@ -44,7 +44,7 @@ jobs:
            platform: android
            artifact-name: godot-cpp-android-arm64-release
            artifact-path: bin/libgodot-cpp.android.release.arm64v8.a
-            flags: android_arch=arm64v8
+            flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME android_arch=arm64v8

          - name: 🍏 iOS (arm64)
            os: macos-11
@@ -94,7 +94,7 @@ jobs:
      - name: Run test GDNative library
        if: ${{ matrix.platform == 'linux' || matrix.platform == 'osx' }}
        run: |
-          curl -LO https://downloads.tuxfamily.org/godotengine/3.4/${{ matrix.godot_zip }}
+          curl -LO https://downloads.tuxfamily.org/godotengine/3.5/${{ matrix.godot_zip }}
          unzip ${{ matrix.godot_zip }}
          ./${{ matrix.executable }} --path test -s script.gd

@@ -106,7 +106,7 @@ jobs:
          if-no-files-found: error

  static-checks:
-    name: Static Checks (clang-format)
+    name: 📊 Static Checks (clang-format)
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 # Misc
+gen/*
 logs/*
 *.log

--- a/2
+++ b/2
Author	SHA1	Message	Date
Rémi Verschelde	76d6ad5d8d	headers: Sync with upstream 3.5 commit 338114d47 (3.5.2-stable)	2023-03-07 09:38:59 +01:00
Rémi Verschelde	316b91c5f5	headers: Sync with upstream 3.5 commit 63d04316d (3.5.1-stable)	2022-09-28 00:01:34 +02:00
Rémi Verschelde	97c181a246	Merge pull request #832 from aaronfranke/3.x-ci	2022-09-08 09:47:54 +02:00
Aaron Franke	62714899ff	Upgrade 3.x CI to Godot 3.5-stable	2022-09-07 22:30:09 -05:00
Fabio Alessandrelli	02333f8dae	[CI] Fix Android builds after GH container update. (cherry picked from commit `0943dfc34a`)	2022-08-07 15:46:39 +02:00