From 6bdc1e8d65d822844e78b9e4abb71ecde9a8f7f8 Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 1 Jun 2021 09:55:51 -0400 Subject: [PATCH] Handle separate APKs per CPU architecture --- .github/workflows/build_app.yml | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_app.yml b/.github/workflows/build_app.yml index 26cffe9..4cc4c8c 100644 --- a/.github/workflows/build_app.yml +++ b/.github/workflows/build_app.yml @@ -77,9 +77,23 @@ jobs: configuration-cache-enabled: true - name: Clean up build artifacts run: | - cp app/build/outputs/apk/standard/debug/app-standard-debug.apk tachiyomi-r${{ env.COMMIT_COUNT }}.apk + set -x + + cp app/build/outputs/apk/standard/debug/app-standard-universal-debug.apk tachiyomi-r${{ env.COMMIT_COUNT }}.apk md5=`md5sum tachiyomi-r${{ env.COMMIT_COUNT }}.apk | awk '{ print $1 }'` - echo "APK_MD5=$md5" >> $GITHUB_ENV + echo "APK_UNIVERSAL_MD5=$md5" >> $GITHUB_ENV + + cp app/build/outputs/apk/standard/debug/app-standard-arm64-v8a-debug.apk tachiyomi-arm64-v8a-r${{ env.COMMIT_COUNT }}.apk + md5=`md5sum tachiyomi-arm64-v8a-r${{ env.COMMIT_COUNT }}.apk | awk '{ print $1 }'` + echo "APK_ARM64_V8A_MD5=$md5" >> $GITHUB_ENV + + cp app/build/outputs/apk/standard/debug/app-standard-armeabi-v7a-debug.apk tachiyomi-armeabi-v7a-r${{ env.COMMIT_COUNT }}.apk + md5=`md5sum tachiyomi-armeabi-v7a-r${{ env.COMMIT_COUNT }}.apk | awk '{ print $1 }'` + echo "APK_ARMEABI_V7A_MD5=$md5" >> $GITHUB_ENV + + cp app/build/outputs/apk/standard/debug/app-standard-x86-debug.apk tachiyomi-x86-r${{ env.COMMIT_COUNT }}.apk + md5=`md5sum tachiyomi-x86-r${{ env.COMMIT_COUNT }}.apk | awk '{ print $1 }'` + echo "APK_X86_MD5=$md5" >> $GITHUB_ENV - name: Create Release uses: softprops/action-gh-release@v1 @@ -89,11 +103,21 @@ jobs: body: | Commits: https://github.com/tachiyomiorg/tachiyomi/compare/${{ env.PREV_RELEASE_SHA }}...${{ env.CURRENT_SHA }} + --- + ${{ env.COMMIT_LOGS }} - MD5: ${{ env.APK_MD5 }} + --- + + MD5 (universal): ${{ env.APK_UNIVERSAL_MD5 }} + MD5 (arm74-v8a): ${{ env.APK_ARM64_V8A_MD5 }} + MD5 (armeabi-v7a): ${{ env.APK_ARMEABI_V7A_MD5 }} + MD5 (x86): ${{ env.APK_X86_MD5 }} files: | tachiyomi-r${{ env.COMMIT_COUNT }}.apk + tachiyomi-arm64-v8a-r${{ env.COMMIT_COUNT }}.apk + tachiyomi-armeabi-v7a-r${{ env.COMMIT_COUNT }}.apk + tachiyomi-x86-r${{ env.COMMIT_COUNT }}.apk draft: ${{ github.event.inputs.dry-run != '' }} prerelease: false env: