From 1cdde4d5a91278097e535b37f7ac407f8842b110 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Wed, 16 Oct 2024 14:26:15 +0200 Subject: [PATCH 1/4] GHA: Add iOS builds to GDExtension workflow --- .github/workflows/gdextension.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml index 537a2a0f..275a8bd9 100644 --- a/.github/workflows/gdextension.yml +++ b/.github/workflows/gdextension.yml @@ -168,6 +168,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 500775eb14931068a4ad0aac5d43ce68d2ae2e62 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Thu, 18 Jul 2024 17:37:19 +0200 Subject: [PATCH 2/4] 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 4cea5dd5..51149b55 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.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 7f38fe2b8bce276bbcd3eae0686c07e1b0fd09e4 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Thu, 18 Jul 2024 21:19:26 +0200 Subject: [PATCH 3/4] GHA: Change iOS arch to arm64 & build simulator libs --- .github/workflows/gdextension.yml | 18 ++++++++++++++++-- gdextension/limboai.gdextension | 6 ++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml index 275a8bd9..b11be038 100644 --- a/.github/workflows/gdextension.yml +++ b/.github/workflows/gdextension.yml @@ -168,14 +168,28 @@ 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: arm64 + should-build: ${{ !inputs.test-build }} + + - name: 🍏 iOS (arm64, debug) + runner: macos-latest + platform: ios + target: template_debug + 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 (universal, debug) + - name: 🍏 iOS (simulator, debug) runner: macos-latest platform: ios target: template_debug diff --git a/gdextension/limboai.gdextension b/gdextension/limboai.gdextension index 51149b55..50915a52 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.universal.dylib" -ios.debug = "res://addons/limboai/bin/liblimboai.ios.template_debug.universal.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" From ee8c773e718db33b185e69dd7729ee91b46fa353 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Wed, 16 Oct 2024 14:30:26 +0200 Subject: [PATCH 4/4] GHA: Build with ios_simulator=yes flag --- .github/workflows/gdextension.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml index b11be038..dc3d82ac 100644 --- a/.github/workflows/gdextension.yml +++ b/.github/workflows/gdextension.yml @@ -187,6 +187,7 @@ jobs: platform: ios target: template_release arch: universal + scons-flags: ios_simulator=yes should-build: ${{ !inputs.test-build }} - name: 🍏 iOS (simulator, debug) @@ -194,6 +195,7 @@ jobs: platform: ios target: template_debug arch: universal + scons-flags: ios_simulator=yes should-build: ${{ !inputs.test-build }} exclude: @@ -299,7 +301,7 @@ jobs: DEBUG_FLAGS: ${{ inputs.debug-symbols && 'debug_symbols=yes symbols_visibility=visible' || 'debug_symbols=no' }} run: | PATH=${GITHUB_WORKSPACE}/buildroot/bin:$PATH - scons platform=${{matrix.opts.platform}} target=${{matrix.opts.target}} arch=${{matrix.opts.arch}} ${{env.DEBUG_FLAGS}} ${{env.SCONSFLAGS}} + scons platform=${{matrix.opts.platform}} target=${{matrix.opts.target}} arch=${{matrix.opts.arch}} ${{env.DEBUG_FLAGS}} ${{matrix.opts.scons-flags}} ${{env.SCONSFLAGS}} - name: Prepare artifact shell: bash