diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2deef9f5d..dcbc6a123 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -375,7 +375,7 @@ ndk:arm64-v8a: - echo "Build Options:"; grep "^XRT_" build/CMakeCache.txt - ninja -C build -android:outOfProcess: +android:outOfProcessDebug: stage: build extends: - .monado.image.debian:bullseye-ndk @@ -398,7 +398,7 @@ android:outOfProcess: paths: - src/xrt/targets/openxr_android/build/outputs/apk/outOfProcess -android:inProcess: +android:inProcessDebug: stage: build extends: - .monado.image.debian:bullseye-ndk @@ -421,6 +421,52 @@ android:inProcess: paths: - src/xrt/targets/openxr_android/build/outputs/apk/inProcess +android:outOfProcessRelease: + stage: build + extends: + - .monado.image.debian:bullseye-ndk + before_script: + # For caching gradle stuff + - export GRADLE_USER_HOME=`pwd`/.gradlehome + + variables: + GRADLE_ARGS: "-Porg.gradle.daemon=false " + cache: + paths: + - .gradlehome/wrapper + - .gradlehome/caches + + script: + - cp .gitlab-ci/local.properties . + - ./gradlew clean + - ./gradlew assembleOutOfProcessRelease + artifacts: + paths: + - src/xrt/targets/openxr_android/build/outputs/apk/outOfProcess + +android:inProcessRelease: + stage: build + extends: + - .monado.image.debian:bullseye-ndk + before_script: + # For caching gradle stuff + - export GRADLE_USER_HOME=`pwd`/.gradlehome + + variables: + GRADLE_ARGS: "-Porg.gradle.daemon=false " + cache: + paths: + - .gradlehome/wrapper + - .gradlehome/caches + + script: + - cp .gitlab-ci/local.properties . + - ./gradlew clean + - ./gradlew assembleInProcessRelease + artifacts: + paths: + - src/xrt/targets/openxr_android/build/outputs/apk/inProcess + ubuntu:cmake: stage: build extends: diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index af20e0e2f..2f6219b10 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -142,14 +142,22 @@ distributions: BUILD_DOC: "OFF" ANDROID_ABI: arm64-v8a - - name: android:outOfProcess + - name: android:outOfProcessDebug target: assembleOutOfProcessDebug artifact_path: src/xrt/targets/openxr_android/build/outputs/apk/outOfProcess - - name: android:inProcess + - name: android:inProcessDebug target: assembleInProcessDebug artifact_path: src/xrt/targets/openxr_android/build/outputs/apk/inProcess + - name: android:outOfProcessRelease + target: assembleOutOfProcessRelease + artifact_path: src/xrt/targets/openxr_android/build/outputs/apk/outOfProcess + + - name: android:inProcessRelease + target: assembleInProcessRelease + artifact_path: src/xrt/targets/openxr_android/build/outputs/apk/inProcess + - name: ubuntu images: # LTS