From 41192ea7f53ea4781dbd2090305f575abf15c8e1 Mon Sep 17 00:00:00 2001 From: txyyh Date: Fri, 20 May 2022 19:38:00 +0800 Subject: [PATCH 1/5] Format --- .github/workflows/android.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index b9cc1b349..8b6ef45c3 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -8,15 +8,19 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: temurin java-version: 11 + - name: Setup Android SDK Tools uses: android-actions/setup-android@v2 + - name: Install NDK run: | echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null + - uses: gradle/gradle-build-action@v2 - run: | git submodule update --init --recursive From c89d42f3680d78e25d7b85da0c901b889a7e9e92 Mon Sep 17 00:00:00 2001 From: txyyh Date: Fri, 20 May 2022 20:26:07 +0800 Subject: [PATCH 2/5] Use keystore in project --- app/build.gradle | 20 ++++++-------------- app/keystore/androidkey.jks | Bin 0 -> 2629 bytes gradle.properties | 7 +++++++ 3 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 app/keystore/androidkey.jks diff --git a/app/build.gradle b/app/build.gradle index a406991af..a68588577 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,14 +22,12 @@ android { } signingConfigs { - if (localProperties.getProperty("storeFile") != null) { sign { - storeFile file(localProperties.getProperty("storeFile")) - storePassword localProperties.getProperty("storePassword") - keyAlias localProperties.getProperty("keyAlias") - keyPassword localProperties.getProperty("keyPassword") + storeFile file(signStoreFile) + storePassword signStorePassword + keyAlias signkeyAlias + keyPassword signkeyPassword } - } } buildFeatures { @@ -76,17 +74,11 @@ android { minifyEnabled true shrinkResources true proguardFiles 'proguard-rules.pro' - if (localProperties.getProperty("storeFile") != null) { - signingConfig signingConfigs.sign - } + signingConfig signingConfigs.sign } debug { applicationIdSuffix ".debug" - if (localProperties.getProperty("storeFile") != null) { - signingConfig signingConfigs.sign - } else { - signingConfig signingConfigs.debug - } + signingConfig signingConfigs.debug } } diff --git a/app/keystore/androidkey.jks b/app/keystore/androidkey.jks new file mode 100644 index 0000000000000000000000000000000000000000..a69b7d1cb9b34019f8e21c637ffaf737232018c2 GIT binary patch literal 2629 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 literal 0 HcmV?d00001 diff --git a/gradle.properties b/gradle.properties index 04a30fdda..2d7bff8b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,3 +21,10 @@ android.useAndroidX=true android.enableJetifier=true android.enableAppCompileTimeRClass=true android.nonTransitiveRClass=true + +# signing environment variable +signStoreFile=keystore/androidkey.jks +signStorePassword=000000 +signkeyAlias=key0 +signkeyPassword=000000 + From ccf22eaef4220db1136504271edceb73c1335865 Mon Sep 17 00:00:00 2001 From: txyyh Date: Fri, 20 May 2022 21:30:44 +0800 Subject: [PATCH 3/5] Upload right artifact --- .github/workflows/android.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 8b6ef45c3..bf4eb00e7 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -28,5 +28,10 @@ jobs: - uses: actions/upload-artifact@v3 with: - name: github-${{ github.sha }} - path: app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk + name: arm64-${{ github.sha }} + path: app/build/outputs/apk/release/app-arm64-v8a-release.apk + + - uses: actions/upload-artifact@v3 + with: + name: x86_64-${{ github.sha }} + path: app/build/outputs/apk/release/app-x86_64-release.apk \ No newline at end of file From 328e7745b7d78875deaddaa22a6f18b6a9ed23bc Mon Sep 17 00:00:00 2001 From: txyyh Date: Fri, 20 May 2022 23:14:09 +0800 Subject: [PATCH 4/5] Add step name --- .github/workflows/android.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index bf4eb00e7..384af56a4 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -7,9 +7,11 @@ jobs: name: Build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - name: Setup Java 11 + uses: actions/setup-java@v3 with: distribution: temurin java-version: 11 @@ -21,17 +23,20 @@ jobs: run: | echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null - - uses: gradle/gradle-build-action@v2 + - name: Gradle Build + uses: gradle/gradle-build-action@v2 - run: | git submodule update --init --recursive gradle assembleRelease - - uses: actions/upload-artifact@v3 + - name: Update ARM64 + uses: actions/upload-artifact@v3 with: name: arm64-${{ github.sha }} path: app/build/outputs/apk/release/app-arm64-v8a-release.apk - - uses: actions/upload-artifact@v3 + - name: Update x86_64 + uses: actions/upload-artifact@v3 with: name: x86_64-${{ github.sha }} path: app/build/outputs/apk/release/app-x86_64-release.apk \ No newline at end of file From 84ac57d69e1a88ac57a24b56984aa251d0e6b34f Mon Sep 17 00:00:00 2001 From: txyyh Date: Fri, 20 May 2022 23:19:10 +0800 Subject: [PATCH 5/5] Releases with tag --- .github/workflows/releases.yml | 42 ++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/releases.yml diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml new file mode 100644 index 000000000..4ce69fa27 --- /dev/null +++ b/.github/workflows/releases.yml @@ -0,0 +1,42 @@ +name: Releases + +on: + push: + tags: + - "*" + +jobs: + linux: + name: Build + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup Java 11 + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + + - name: Setup Android SDK Tools + uses: android-actions/setup-android@v2 + + - name: Install NDK + run: | + echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null + + - name: Gradle Build + uses: gradle/gradle-build-action@v2 + - run: | + git submodule update --init --recursive + gradle assembleRelease + + - name: Releases + uses: softprops/action-gh-release@v0.1.14 + with: + body: Bump Version + prerelease: true + files: | + app/build/outputs/apk/release/app-arm64-v8a-release.apk + app/build/outputs/apk/release/app-x86_64-release.apk