unbreak and fix local install

planetis-m · Jul 16, 2024 · 23009ce · 23009ce
1 parent e3bf776
commit 23009ce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
         nimble -d:GitHubCI setupBuildEnv -Y
     - name: Run tests
       run: |
-        nimble -d:GitHubCI test
+        nimble -d:GitHubCI testCI
     - name: Upload APK artifact
       uses: actions/upload-artifact@v4
       with:
@@ -58,7 +58,7 @@ jobs:
         nimble -d:GitHubCI setupBuildEnv -Y
     - name: Run tests
       run: |
-        nimble -d:GitHubCI test
+        nimble -d:GitHubCI testCI
     - name: Upload APK artifact
       uses: actions/upload-artifact@v4
       with:

diff --git a/build_android.nims b/build_android.nims
@@ -37,8 +37,8 @@ const
 # Required path variables
 const
   JavaHome = getEnv"JAVA_HOME"
-  AndroidNdk = getEnv"ANDROID_NDK"
-  AndroidHome = getEnv"ANDROID_HOME"
+  AndroidNdk = when defined(GitHubCI): getEnv"GITHUB_WORKSPACE" / "android-ndk" else: getEnv"ANDROID_NDK"
+  AndroidHome = when defined(GitHubCI): getEnv"GITHUB_WORKSPACE" / "android-sdk" else: getEnv"ANDROID_HOME"
   AndroidBuildTools = AndroidHome / "build-tools/34.0.0"
   AndroidPlatformTools = AndroidHome / "platform-tools"
 

diff --git a/raylib_game.nimble b/raylib_game.nimble
@@ -22,7 +22,7 @@ elif detectOs(Ubuntu):
 include "build_android.nims"
 include "setup_build_env.nims"
 
-task test, "Runs the test suite":
+task testCI, "Runs the test suite":
   # Test Android cross-compilation
   setupAndroidTask()
   buildAndroidTask()