From 1fc9acc6696637b381afe3097c4b7a021531ca89 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Thu, 18 Jul 2024 17:09:30 +0200 Subject: [PATCH 1/9] GHA: Add GDExtension iOS builds --- .github/workflows/gdextension.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml index 44db582..efdba26 100644 --- a/.github/workflows/gdextension.yml +++ b/.github/workflows/gdextension.yml @@ -160,6 +160,20 @@ jobs: arch: x86_32 should-build: ${{ !inputs.test-build }} + - name: 🍎 iOS (universal, release) + runner: macos-latest + platform: ios + target: template_release + arch: universal + should-build: ${{ !inputs.test-build }} + + - name: 🍎 iOS (universal, debug) + runner: macos-latest + platform: ios + target: template_debug + arch: universal + should-build: ${{ !inputs.test-build }} + exclude: - { opts: { should-build: false } } From a8a0a02ef0220734fbd3f7ef6f9f3bedb7c7998d Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Thu, 18 Jul 2024 17:17:25 +0200 Subject: [PATCH 2/9] GHA: Use green icons for iOS builds --- .github/workflows/gdextension.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml index efdba26..977c1b5 100644 --- a/.github/workflows/gdextension.yml +++ b/.github/workflows/gdextension.yml @@ -160,14 +160,14 @@ jobs: arch: x86_32 should-build: ${{ !inputs.test-build }} - - name: 🍎 iOS (universal, release) + - name: 🍏 iOS (universal, release) runner: macos-latest platform: ios target: template_release arch: universal should-build: ${{ !inputs.test-build }} - - name: 🍎 iOS (universal, debug) + - name: 🍏 iOS (universal, debug) runner: macos-latest platform: ios target: template_debug From f54968f57674e06ca65f0836636ea4323fc327f5 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Thu, 18 Jul 2024 17:19:31 +0200 Subject: [PATCH 3/9] GHA: Fix iOS strip --- .github/workflows/gdextension.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml index 977c1b5..d2ac1ce 100644 --- a/.github/workflows/gdextension.yml +++ b/.github/workflows/gdextension.yml @@ -307,7 +307,10 @@ jobs: ls -l -R out/addons/limboai/bin/ echo "---" if [ "$RUNNER_OS" == "macOS" ]; then - strip -u out/addons/limboai/bin/liblimboai*/liblimboai* + # MacOS libs + strip -u out/addons/limboai/bin/liblimboai*/liblimboai* || true + # iOS libs + strip -u out/addons/limboai/bin/liblimboai* || true else strip out/addons/limboai/bin/liblimboai* fi From 18e7aef7169ffa2401194bccb04fef7d04740886 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Thu, 18 Jul 2024 17:20:48 +0200 Subject: [PATCH 4/9] GHA: Change default godot-cpp branch to master --- .github/workflows/gdextension.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml index d2ac1ce..22aca10 100644 --- a/.github/workflows/gdextension.yml +++ b/.github/workflows/gdextension.yml @@ -5,7 +5,7 @@ on: godot-cpp-ref: description: A tag, branch or commit hash in the godot-cpp repository. type: string - default: 4.2 + default: master limboai-ref: description: A tag, branch or commit hash in the LimboAI repository. type: string @@ -20,7 +20,7 @@ on: godot-cpp-ref: description: A tag, branch or commit hash in the godot-cpp repository. type: string - default: 4.2 + default: master limboai-ref: description: A tag, branch or commit hash in the LimboAI repository. type: string From bcd59faae49572acd9bad818954bb8405714ae64 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Thu, 18 Jul 2024 17:37:19 +0200 Subject: [PATCH 5/9] Add iOS builds to the GDExtension manifest --- gdextension/limboai.gdextension | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gdextension/limboai.gdextension b/gdextension/limboai.gdextension index 4cea5dd..0ba68f8 100644 --- a/gdextension/limboai.gdextension +++ b/gdextension/limboai.gdextension @@ -25,6 +25,8 @@ android.debug.x86_64 = "res://addons/limboai/bin/liblimboai.android.template_deb android.release.x86_64 = "res://addons/limboai/bin/liblimboai.android.template_release.x86_64.so" android.debug.x86_32 = "res://addons/limboai/bin/liblimboai.android.template_debug.x86_32.so" android.release.x86_32 = "res://addons/limboai/bin/liblimboai.android.template_release.x86_32.so" +ios.release = "res://addons/limboai/bin/liblimboai.ios.template_release.dylib" +ios.debug = "res://addons/limboai/bin/liblimboai.ios.template_debug.dylib" web.debug.wasm32 = "res://addons/limboai/bin/liblimboai.web.template_debug.wasm32.wasm" web.release.wasm32 = "res://addons/limboai/bin/liblimboai.web.template_release.wasm32.wasm" From a7a39ff5e0a90f1c91e0a8fcaa3fbfa01a6b00eb Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Thu, 18 Jul 2024 18:27:23 +0200 Subject: [PATCH 6/9] Fix iOS manifest wrong file names --- gdextension/limboai.gdextension | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdextension/limboai.gdextension b/gdextension/limboai.gdextension index 0ba68f8..51149b5 100644 --- a/gdextension/limboai.gdextension +++ b/gdextension/limboai.gdextension @@ -25,8 +25,8 @@ android.debug.x86_64 = "res://addons/limboai/bin/liblimboai.android.template_deb android.release.x86_64 = "res://addons/limboai/bin/liblimboai.android.template_release.x86_64.so" android.debug.x86_32 = "res://addons/limboai/bin/liblimboai.android.template_debug.x86_32.so" android.release.x86_32 = "res://addons/limboai/bin/liblimboai.android.template_release.x86_32.so" -ios.release = "res://addons/limboai/bin/liblimboai.ios.template_release.dylib" -ios.debug = "res://addons/limboai/bin/liblimboai.ios.template_debug.dylib" +ios.release = "res://addons/limboai/bin/liblimboai.ios.template_release.universal.dylib" +ios.debug = "res://addons/limboai/bin/liblimboai.ios.template_debug.universal.dylib" web.debug.wasm32 = "res://addons/limboai/bin/liblimboai.web.template_debug.wasm32.wasm" web.release.wasm32 = "res://addons/limboai/bin/liblimboai.web.template_release.wasm32.wasm" From 7c0e1e8280b7cb2af774f12f75aa31542b37acbc Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Thu, 18 Jul 2024 18:27:36 +0200 Subject: [PATCH 7/9] Disable stripping of iOS libs --- .github/workflows/gdextension.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml index 22aca10..3a3f116 100644 --- a/.github/workflows/gdextension.yml +++ b/.github/workflows/gdextension.yml @@ -310,7 +310,7 @@ jobs: # MacOS libs strip -u out/addons/limboai/bin/liblimboai*/liblimboai* || true # iOS libs - strip -u out/addons/limboai/bin/liblimboai* || true + # strip -u out/addons/limboai/bin/liblimboai* || true else strip out/addons/limboai/bin/liblimboai* fi From 7608b4283b177f4c2e93d992752f983b164fda43 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Thu, 18 Jul 2024 21:19:26 +0200 Subject: [PATCH 8/9] GHA: Change iOS arch to arm64 --- .github/workflows/gdextension.yml | 8 ++++---- gdextension/limboai.gdextension | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml index 3a3f116..7bbd323 100644 --- a/.github/workflows/gdextension.yml +++ b/.github/workflows/gdextension.yml @@ -160,18 +160,18 @@ jobs: arch: x86_32 should-build: ${{ !inputs.test-build }} - - name: 🍏 iOS (universal, release) + - name: 🍏 iOS (arm64, release) runner: macos-latest platform: ios target: template_release - arch: universal + arch: arm64 should-build: ${{ !inputs.test-build }} - - name: 🍏 iOS (universal, debug) + - name: 🍏 iOS (arm64, debug) runner: macos-latest platform: ios target: template_debug - arch: universal + arch: arm64 should-build: ${{ !inputs.test-build }} exclude: diff --git a/gdextension/limboai.gdextension b/gdextension/limboai.gdextension index 51149b5..19d3449 100644 --- a/gdextension/limboai.gdextension +++ b/gdextension/limboai.gdextension @@ -25,8 +25,8 @@ android.debug.x86_64 = "res://addons/limboai/bin/liblimboai.android.template_deb android.release.x86_64 = "res://addons/limboai/bin/liblimboai.android.template_release.x86_64.so" android.debug.x86_32 = "res://addons/limboai/bin/liblimboai.android.template_debug.x86_32.so" android.release.x86_32 = "res://addons/limboai/bin/liblimboai.android.template_release.x86_32.so" -ios.release = "res://addons/limboai/bin/liblimboai.ios.template_release.universal.dylib" -ios.debug = "res://addons/limboai/bin/liblimboai.ios.template_debug.universal.dylib" +ios.release = "res://addons/limboai/bin/liblimboai.ios.template_release.arm64.dylib" +ios.debug = "res://addons/limboai/bin/liblimboai.ios.template_debug.arm64.dylib" web.debug.wasm32 = "res://addons/limboai/bin/liblimboai.web.template_debug.wasm32.wasm" web.release.wasm32 = "res://addons/limboai/bin/liblimboai.web.template_release.wasm32.wasm" From 04752097740050f7a31b78aaf78c55e7b30a1edd Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Thu, 18 Jul 2024 21:31:48 +0200 Subject: [PATCH 9/9] GHA: Build simulator libs for iOS --- .github/workflows/gdextension.yml | 14 ++++++++++++++ gdextension/limboai.gdextension | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml index 7bbd323..630761d 100644 --- a/.github/workflows/gdextension.yml +++ b/.github/workflows/gdextension.yml @@ -174,6 +174,20 @@ jobs: arch: arm64 should-build: ${{ !inputs.test-build }} + - name: 🍏 iOS (simulator, release) + runner: macos-latest + platform: ios + target: template_release + arch: universal + should-build: ${{ !inputs.test-build }} + + - name: 🍏 iOS (simulator, debug) + runner: macos-latest + platform: ios + target: template_debug + arch: universal + should-build: ${{ !inputs.test-build }} + exclude: - { opts: { should-build: false } } diff --git a/gdextension/limboai.gdextension b/gdextension/limboai.gdextension index 19d3449..50915a5 100644 --- a/gdextension/limboai.gdextension +++ b/gdextension/limboai.gdextension @@ -25,8 +25,10 @@ android.debug.x86_64 = "res://addons/limboai/bin/liblimboai.android.template_deb android.release.x86_64 = "res://addons/limboai/bin/liblimboai.android.template_release.x86_64.so" android.debug.x86_32 = "res://addons/limboai/bin/liblimboai.android.template_debug.x86_32.so" android.release.x86_32 = "res://addons/limboai/bin/liblimboai.android.template_release.x86_32.so" -ios.release = "res://addons/limboai/bin/liblimboai.ios.template_release.arm64.dylib" -ios.debug = "res://addons/limboai/bin/liblimboai.ios.template_debug.arm64.dylib" +ios.release.arm64 = "res://addons/limboai/bin/liblimboai.ios.template_release.arm64.dylib" +ios.debug.arm64 = "res://addons/limboai/bin/liblimboai.ios.template_debug.arm64.dylib" +ios.release.simulator = "res://addons/limboai/bin/liblimboai.ios.template_release.universal.dylib" +ios.debug.simulator = "res://addons/limboai/bin/liblimboai.ios.template_debug.universal.dylib" web.debug.wasm32 = "res://addons/limboai/bin/liblimboai.web.template_debug.wasm32.wasm" web.release.wasm32 = "res://addons/limboai/bin/liblimboai.web.template_release.wasm32.wasm"