Fix android ci

axmolengine · Feb 1, 2024 · 5afc17c · 5afc17c
1 parent df165fe
commit 5afc17c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -479,6 +479,9 @@ endif()
 
 # yasio
 ax_add_3rd(yasio)
+if(ANDROID) # stupid, public include not enough android
+    target_include_directories(thirdparty INTERFACE yasio)
+endif()
 
 # simdjson
 ax_add_3rd(simdjson)

diff --git a/tools/ci/genbindings.ps1 b/tools/ci/genbindings.ps1
@@ -43,12 +43,13 @@ if (!(Test-Path "$AX_ROOT/core/axmolver.h" -PathType Leaf)) {
 Push-Location $AX_ROOT/tools/tolua
 
 python genbindings.py --ndk_root "$ndk_root"
+$succeed = $?
 
 Pop-Location
 
 Push-Location $AX_ROOT
 
-if ($env:GITHUB_ACTIONS -eq 'true') {
+if ($succeed -and $env:GITHUB_ACTIONS -eq 'true') {
     $git_status = "$(git status)"
     $no_changes = $git_status.IndexOf('modified:') -eq -1 # -and $git_status.IndexOf('deleted:') -eq -1 -and $git_status.IndexOf('Untracked', [StringComparison]::OrdinalIgnoreCase) -eq -1
     if ($no_changes) {
@@ -59,3 +60,7 @@ if ($env:GITHUB_ACTIONS -eq 'true') {
 }
 
 Pop-Location
+
+if(!$succeed) {
+    throw "Generating lua bindings fails"
+}