From 122c3e6a81d2f7a66a356ad0b2c954f8276800b3 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Tue, 18 Jun 2024 00:38:35 +0200
Subject: [PATCH] ci: create simpler Gradle testspriteminimal project instead
---
.github/workflows/android.yml | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index d30559a869ca3..f6940806fb532 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -40,25 +40,25 @@ jobs:
- name: Create Gradle project
if: ${{ matrix.platform.gradle }}
run: |
- build-scripts/androidbuild.sh org.libsdl.testcontroller src/test/SDL_test_* test/testcontroller.c test/gamepad* test/testutils*
+ build-scripts/androidbuild.sh org.libsdl.testspriteminimal test/testspriteminimal.c test/icon.h
echo ""
echo "Project contents:"
echo ""
- find "build/org.libsdl.testcontroller"
+ find "build/org.libsdl.testspriteminimal"
- name: Build app (Gradle & ndk-build)
if: ${{ matrix.platform.gradle }}
run: |
- cd build/org.libsdl.testcontroller
+ cd build/org.libsdl.testspriteminimal
./gradlew -i assembleRelease
- name: Build app (Gradle & CMake)
if: ${{ matrix.platform.gradle }}
run: |
- cd build/org.libsdl.testcontroller
+ cd build/org.libsdl.testspriteminimal
./gradlew -i assembleRelease -PBUILD_WITH_CMAKE=1
# - name: Build library (Gradle)
# if: ${{ matrix.platform.gradle }}
# run: |
-# cd build/org.libsdl.testcontroller
+# cd build/org.libsdl.testspriteminimal
# ./gradlew -i assembleRelease -PBUILD_AS_LIBRARY=1
- name: Setup (CMake)
if: ${{ matrix.platform.cmake }}
@@ -94,7 +94,14 @@ jobs:
- name: Build test apk's (CMake)
if: ${{ matrix.platform.cmake }}
run: |
- cmake --build build --config Release --parallel --verbose --target testautomation-apk testaudiorecording-apk testcontroller-apk testmultiaudio-apk testsprite-apk
+ cmake --build build --config Release --parallel \
+ --target \
+ testaudiorecording-apk \
+ testautomation-apk \
+ testcontroller-apk \
+ testmultiaudio-apk \
+ testsprite-apk \
+ --verbose
- name: Install (CMake)
if: ${{ matrix.platform.cmake }}
run: |