From 10c751afc353d0ae5e24b7c602bd779029c50386 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Fri, 14 Jan 2022 23:23:36 +0200 Subject: [PATCH] Fixed debug info not stripped in CI scripts, build .aab files --- .github/workflows/ballfield.yml | 39 ++++++++++++++++++++++++++++++++- .github/workflows/sdl2-demo.yml | 39 ++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ballfield.yml b/.github/workflows/ballfield.yml index 80be46ad0..2f4d83350 100644 --- a/.github/workflows/ballfield.yml +++ b/.github/workflows/ballfield.yml @@ -57,7 +57,39 @@ jobs: run: | sed -i "s/MultiABI=.*/MultiABI='${ARCH_LIST}'/g" project/jni/application/src/AndroidAppSettings.cfg - - name: Build Boost, ICU, and OpenSSL + - name: Get Boost revision + id: boost-rev + run: echo "::set-output name=BOOST_REV::`git -C project/jni/boost/src rev-parse HEAD`" + + - name: Get ICU revision + id: icu-rev + run: echo "::set-output name=ICU_REV::`git -C project/jni/iconv/src rev-parse HEAD`" + + - name: Copy precompiled libraries from cache + uses: actions/cache@v2 + id: cache + with: + # The same SDL revision will produce the same libraries + key: ${{steps.boost-rev.outputs.BOOST_REV}}-${{steps.icu-rev.outputs.ICU_REV}} + path: | + build-android/project/jni/boost/include + build-android/project/jni/boost/lib + build-android/project/jni/iconv/include + build-android/project/jni/iconv/lib + build-android/project/jni/icuuc/include + build-android/project/jni/icuuc/lib + + - name: Touch cached file timestamps + if: steps.cache.outputs.cache-hit == 'true' + working-directory: build-android + run: > + touch + project/jni/boost/lib/*/* + project/jni/iconv/lib/*/* + project/jni/icuuc/lib/*/* + || true + + - name: Patch Java files and build Boost, ICU, and OpenSSL run: | export PATH=$ANDROID_NDK_LATEST_HOME:$PATH ./changeAppSettings.sh @@ -70,6 +102,8 @@ jobs: for Y in `seq 20`; do echo y; done | sudo $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses --sdk_root=`pwd` mkdir -p $HOME/.android keytool -genkey -v -keystore $HOME/.android/debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Debug, OU=Debug, O=Debug, L=Debug, ST=Debug, C=Debug" + echo "sdk.dir=$ANDROID_SDK_ROOT" > local.properties + echo "proguard.config=proguard.cfg;proguard-local.cfg" >> local.properties - name: Hyper turbo build script GOOOOOOOOOOOO run: | @@ -80,6 +114,9 @@ jobs: run: | mkdir -p upload/ mv project/app/build/outputs/apk/release/app-release.apk upload/${APP_NAME}.apk + cd project + ./gradlew bundleReleaseWithDebugInfo + mv app/build/outputs/bundle/releaseWithDebugInfo/app-releaseWithDebugInfo.aab ../upload/${APP_NAME}.aab # Github actions is dumb and won't let you download single files from artifacts, so break up the artifacts instead - uses: actions/upload-artifact@v2 diff --git a/.github/workflows/sdl2-demo.yml b/.github/workflows/sdl2-demo.yml index 3fb141b1e..2a6127adb 100644 --- a/.github/workflows/sdl2-demo.yml +++ b/.github/workflows/sdl2-demo.yml @@ -57,7 +57,39 @@ jobs: run: | sed -i "s/MultiABI=.*/MultiABI='${ARCH_LIST}'/g" project/jni/application/src/AndroidAppSettings.cfg - - name: Build Boost, ICU, and OpenSSL + - name: Get Boost revision + id: boost-rev + run: echo "::set-output name=BOOST_REV::`git -C project/jni/boost/src rev-parse HEAD`" + + - name: Get ICU revision + id: icu-rev + run: echo "::set-output name=ICU_REV::`git -C project/jni/iconv/src rev-parse HEAD`" + + - name: Copy precompiled libraries from cache + uses: actions/cache@v2 + id: cache + with: + # The same SDL revision will produce the same libraries + key: ${{steps.boost-rev.outputs.BOOST_REV}}-${{steps.icu-rev.outputs.ICU_REV}} + path: | + build-android/project/jni/boost/include + build-android/project/jni/boost/lib + build-android/project/jni/iconv/include + build-android/project/jni/iconv/lib + build-android/project/jni/icuuc/include + build-android/project/jni/icuuc/lib + + - name: Touch cached file timestamps + if: steps.cache.outputs.cache-hit == 'true' + working-directory: build-android + run: > + touch + project/jni/boost/lib/*/* + project/jni/iconv/lib/*/* + project/jni/icuuc/lib/*/* + || true + + - name: Patch Java files and build Boost, ICU, and OpenSSL run: | export PATH=$ANDROID_NDK_LATEST_HOME:$PATH ./changeAppSettings.sh @@ -70,6 +102,8 @@ jobs: for Y in `seq 20`; do echo y; done | sudo $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses --sdk_root=`pwd` mkdir -p $HOME/.android keytool -genkey -v -keystore $HOME/.android/debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Debug, OU=Debug, O=Debug, L=Debug, ST=Debug, C=Debug" + echo "sdk.dir=$ANDROID_SDK_ROOT" > local.properties + echo "proguard.config=proguard.cfg;proguard-local.cfg" >> local.properties - name: Hyper turbo build script GOOOOOOOOOOOO run: | @@ -80,6 +114,9 @@ jobs: run: | mkdir -p upload/ mv project/app/build/outputs/apk/release/app-release.apk upload/${APP_NAME}.apk + cd project + ./gradlew bundleReleaseWithDebugInfo + mv app/build/outputs/bundle/releaseWithDebugInfo/app-releaseWithDebugInfo.aab ../upload/${APP_NAME}.aab # Github actions is dumb and won't let you download single files from artifacts, so break up the artifacts instead - uses: actions/upload-artifact@v2