Skip to content

Commit bf974ed

Browse files
committed
Fix Android build matrix, add Linux arm64 build
1 parent 7cfa87a commit bf974ed

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,23 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
target: [template_debug, template_release]
18-
arch: [x86_64, x86_32]
18+
arch: [x86_64, x86_32, arm64, arm32]
1919
platform: [linux, windows, android]
2020
include:
2121
- platform: linux
22-
arch: x86_32
23-
packages: [g++-multilib]
22+
packages: [g++-multilib, g++-arm-linux-gnueabi]
2423
- platform: windows
2524
packages: [g++-mingw-w64]
2625
- platform: android
27-
arch: arm64
2826
scons-args: android_api_level=21 ANDROID_HOME=""
29-
- platform: android
27+
exclude:
28+
- platform: linux
29+
arch: arm32
30+
# TODO: add support for Windows ARM using llvm-mingw
31+
- platform: windows
32+
arch: arm64
33+
- platform: windows
3034
arch: arm32
31-
scons-args: android_api_level=21 ANDROID_HOME=""
32-
- platform: android
33-
arch: x86_64
34-
scons-args: android_api_level=21 ANDROID_HOME=""
35-
- platform: android
36-
arch: x86_32
37-
scons-args: android_api_level=21 ANDROID_HOME=""
3835
steps:
3936
- uses: actions/checkout@v4
4037
with:

addons/lua-gdextension/luagdextension.gdextension

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ linux.debug.x86_32 = "build/libluagdextension.linux.template_debug.x86_32.so"
1717
linux.release.x86_32 = "build/libluagdextension.linux.template_release.x86_32.so"
1818
linux.debug.x86_64 = "build/libluagdextension.linux.template_debug.x86_64.so"
1919
linux.release.x86_64 = "build/libluagdextension.linux.template_release.x86_64.so"
20+
linux.debug.arm64 = "build/libluagdextension.linux.template_debug.arm64.so"
21+
linux.release.arm64 = "build/libluagdextension.linux.template_release.arm64.so"
2022
android.debug.x86_32 = "build/libluagdextension.android.template_debug.x86_32.so"
2123
android.release.x86_32 = "build/libluagdextension.android.template_release.x86_32.so"
2224
android.debug.x86_64 = "build/libluagdextension.android.template_debug.x86_64.so"

0 commit comments

Comments
 (0)