From ae2a697e0134eeec269b2f15a2fca2489422c16b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sun, 18 Apr 2021 19:34:32 +0200
Subject: [PATCH] Merge pull request #1295 from wulkanowy/rbo/update-workflow

Update github action workflow
---
 .github/workflows/deploy-store.yml |  75 +++++++++++++
 .github/workflows/deploy-test.yml  | 144 ++++++++++++++++++++++++
 .github/workflows/test.yml         | 174 +----------------------------
 app/bitrise.jks                    | Bin 2235 -> 0 bytes
 app/build.gradle                   |  12 ++
 build.gradle                       |   1 +
 6 files changed, 235 insertions(+), 171 deletions(-)
 create mode 100644 .github/workflows/deploy-store.yml
 create mode 100644 .github/workflows/deploy-test.yml
 delete mode 100644 app/bitrise.jks

diff --git a/.github/workflows/deploy-store.yml b/.github/workflows/deploy-store.yml
new file mode 100644
index 00000000..3cd08e04
--- /dev/null
+++ b/.github/workflows/deploy-store.yml
@@ -0,0 +1,75 @@
+name: Deploy to app stores
+
+on:
+  release:
+    types: [ created ]
+
+jobs:
+
+  deploy-google-play:
+    name: Deploy to google play
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    environment: google-play
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+      - name: Decrypt keys
+        env:
+          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
+          SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
+        run: |
+          gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg
+          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg
+          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
+      - name: Upload apk to google play
+        env:
+          PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
+          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
+          PLAY_SERVICE_ACCOUNT_EMAIL: ${{ secrets.PLAY_SERVICE_ACCOUNT_EMAIL }}
+          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
+        run: ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
+
+  deploy-app-gallery:
+    name: Deploy to AppGallery
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    environment: app-gallery
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+      - name: Decrypt keys
+        env:
+          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
+          SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
+        run: |
+          gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-services.json.gpg
+          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg
+          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
+      - name: Build HMS version
+        env:
+          PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
+          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
+          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
+        run: ./gradlew assembleHmsRelease --stacktrace
+      - name: Upload APK to AppGallery
+        env:
+          AGC_CLIENT_ID: ${{ secrets.AGC_CLIENT_ID }}
+          AGC_CLIENT_SECRET: ${{ secrets.AGC_CLIENT_SECRET }}
+        run: ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace;
diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml
new file mode 100644
index 00000000..88edca05
--- /dev/null
+++ b/.github/workflows/deploy-test.yml
@@ -0,0 +1,144 @@
+name: Deploy to app tests
+
+on:
+  push:
+#    branches: [ develop ]
+    branches: [ '!*' ]
+  pull_request_target:
+#    branches: [ develop ]
+    branches: [ '!*' ]
+
+  workflow_dispatch:
+
+jobs:
+
+  deploy-appcenter:
+    name: App Center
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    environment: app-center
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+      - name: Set run number with offset
+        env:
+          BUILD_NUMBER_OFFSET: ${{ secrets.BUILD_NUMBER_OFFSET }}
+        run: echo "RUN_NUMBER=$((GITHUB_RUN_NUMBER+BUILD_NUMBER_OFFSET))" >> $GITHUB_ENV
+      - name: Prepare build configuration
+        run: |
+          sed -i -e "s#applicationIdSuffix \".dev\"#applicationIdSuffix \".${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/build.gradle
+          sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/google-services.json
+          sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/agconnect-services.json
+          sed -i -e '/versionNameSuffix/d' app/build.gradle
+      - name: Add signing config
+        run: |
+          cat >> app/build.gradle <<EOF
+          android.signingConfigs.debug {
+              storeFile file("bitrise.jks")
+              storePassword System.getenv("BITRISE_KEYSTORE_PASSWORD")
+              keyAlias System.getenv("BITRISE_KEY_ALIAS")
+              keyPassword System.getenv("BITRISE_KEY_PASSWORD")
+          }
+          EOF
+      - name: Decrypt keys
+        env:
+          BITRISE_ENCRYPT_KEY: ${{ secrets.BITRISE_ENCRYPT_KEY }}
+        run: |
+          gpg --yes --batch --passphrase=$BITRISE_ENCRYPT_KEY ./app/bitrise.jks.gpg
+      - name: Bump version
+        uses: chkfung/android-version-actions@v1.1
+        with:
+          gradlePath: app/build.gradle
+          versionCode: ${{ env.RUN_NUMBER }}
+          versionName: ${{ env.RUN_NUMBER }}-${{ github.head_ref }}
+      - name: Build apk
+        env:
+          BITRISE_KEYSTORE_PASSWORD: ${{ secrets.BITRISE_KEYSTORE_PASSWORD }}
+          BITRISE_KEY_ALIAS: ${{ secrets.BITRISE_KEY_ALIAS }}
+          BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
+        run: ./gradlew assembleFdroidDebug --stacktrace
+      - name: Upload apk to github artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: wulkanowyDEV-${{ env.RUN_NUMBER }}.apk
+          path: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
+      - name: Deploy to app center
+        uses: wzieba/AppCenter-Github-Action@v1
+        with:
+          appName: wulkanowy/wulkanowy
+          token: ${{ secrets.APP_CENTER_TOKEN }}
+          group: Testers
+          file: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
+          notifyTesters: true
+          debug: true
+
+  deploy-app-distribution:
+    name: App Distribution
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    environment: app-distribution
+    if: github.event_name != 'pull_request_target'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+      - name: Set run number with offset
+        env:
+          BUILD_NUMBER_OFFSET: ${{ secrets.BUILD_NUMBER_OFFSET }}
+        run: echo "RUN_NUMBER=$((GITHUB_RUN_NUMBER+BUILD_NUMBER_OFFSET))" >> $GITHUB_ENV
+      - name: Add signing config
+        run: |
+          cat >> app/build.gradle <<EOF
+          android.signingConfigs.debug {
+              storeFile file("bitrise.jks")
+              storePassword System.getenv("BITRISE_KEYSTORE_PASSWORD")
+              keyAlias System.getenv("BITRISE_KEY_ALIAS")
+              keyPassword System.getenv("BITRISE_KEY_PASSWORD")
+          }
+          EOF
+      - name: Decrypt keys
+        env:
+          BITRISE_ENCRYPT_KEY: ${{ secrets.BITRISE_ENCRYPT_KEY }}
+          BITRISE_SERVICES_ENCRYPT_KEY: ${{ secrets.BITRISE_SERVICES_ENCRYPT_KEY }}
+        run: |
+          gpg --yes --batch --passphrase=$BITRISE_SERVICES_ENCRYPT_KEY ./app/src/debug/google-services.json.gpg
+          gpg --yes --batch --passphrase=$BITRISE_ENCRYPT_KEY ./app/bitrise.jks.gpg
+      - name: Bump version
+        uses: chkfung/android-version-actions@v1.1
+        with:
+          gradlePath: app/build.gradle
+          versionCode: ${{ env.RUN_NUMBER }}
+          versionName: ${{ env.RUN_NUMBER }}
+      - name: Build apk
+        env:
+          BITRISE_KEYSTORE_PASSWORD: ${{ secrets.BITRISE_KEYSTORE_PASSWORD }}
+          BITRISE_KEY_ALIAS: ${{ secrets.BITRISE_KEY_ALIAS }}
+          BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
+        run: ./gradlew assemblePlayDebug -PenableFirebase --stacktrace
+      - name: Upload apk to github artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: wulkanowyDEV-${{ env.RUN_NUMBER }}-dev.apk
+          path: app/build/outputs/apk/play/debug/app-play-debug.apk
+      - name: Deploy to app distribution
+        uses: wzieba/Firebase-Distribution-Github-Action@v1
+        with:
+          appId: ${{ secrets.FIREBASE_APP_ID }}
+          token: ${{ secrets.FIREBASE_TOKEN }}
+          groups: discord
+          file: app/build/outputs/apk/play/debug/app-play-debug.apk
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a81b333f..d359360a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,13 +1,11 @@
-name: Test and deploy
+name: Tests
 
 on:
   push:
-    branches: [ develop ]
+    branches: [ master, develop ]
     tags: [ '*' ]
   pull_request:
-    branches: [ develop ]
-
-  workflow_dispatch:
+    branches: [ master, develop ]
 
 jobs:
   unit-tests:
@@ -34,169 +32,3 @@ jobs:
         - uses: codecov/codecov-action@v1
           with:
               flags: unit
-
-  deploy-google-play:
-      name: Deploy to google play
-      runs-on: ubuntu-latest
-      timeout-minutes: 10
-      environment: google-play
-      needs: [ unit-tests ]
-      if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
-      steps:
-        - uses: actions/checkout@v2
-        - uses: actions/setup-java@v1
-          with:
-            java-version: 11
-        - uses: actions/cache@v2
-          with:
-            path: |
-              ~/.gradle/caches
-              ~/.gradle/wrapper
-            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-        - name: Decrypt keys
-          env:
-            ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-            SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
-          run: |
-            gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg
-            gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg
-            gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
-        - name: Upload apk to google play
-          env:
-            PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
-            PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
-            PLAY_SERVICE_ACCOUNT_EMAIL: ${{ secrets.PLAY_SERVICE_ACCOUNT_EMAIL }}
-            PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-          run: ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
-
-  deploy-appcenter:
-      name: Deploy to App Center
-      runs-on: ubuntu-latest
-      timeout-minutes: 10
-      environment: app-center
-      if: github.ref != 'refs/heads/develop'
-      steps:
-        - uses: actions/checkout@v2
-        - uses: actions/setup-java@v1
-          with:
-            java-version: 11
-        - uses: actions/cache@v2
-          with:
-            path: |
-              ~/.gradle/caches
-              ~/.gradle/wrapper
-            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-        - name: Set run number with offset
-          env:
-            BUILD_NUMBER_OFFSET: ${{ secrets.BUILD_NUMBER_OFFSET }}
-          run: echo "RUN_NUMBER=$((GITHUB_RUN_NUMBER+BUILD_NUMBER_OFFSET))" >> $GITHUB_ENV
-        - name: Prepare build configuration
-          run: |
-            sed -i -e "s#applicationIdSuffix \".dev\"#applicationIdSuffix \".${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/build.gradle
-            sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/google-services.json
-            sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/agconnect-services.json
-            sed -i -e '/versionNameSuffix/d' app/build.gradle
-        - name: Add signing config
-          run: |
-            cat >> app/build.gradle <<EOF
-            android.signingConfigs.debug {
-                storeFile file("bitrise.jks")
-                storePassword System.getenv("BITRISE_KEYSTORE_PASSWORD")
-                keyAlias System.getenv("BITRISE_KEY_ALIAS")
-                keyPassword System.getenv("BITRISE_KEY_PASSWORD")
-            }
-            EOF
-        - name: Decrypt keys
-          env:
-            BITRISE_ENCRYPT_KEY: ${{ secrets.BITRISE_ENCRYPT_KEY }}
-          run: |
-            gpg --yes --batch --passphrase=$BITRISE_ENCRYPT_KEY ./app/bitrise.jks.gpg
-        - name: Bump version
-          uses: chkfung/android-version-actions@v1.1
-          with:
-            gradlePath: app/build.gradle
-            versionCode: ${{ env.RUN_NUMBER }}
-            versionName: ${{ env.RUN_NUMBER }}-${{ github.head_ref }}
-        - name: Build apk
-          env:
-            BITRISE_KEYSTORE_PASSWORD: ${{ secrets.BITRISE_KEYSTORE_PASSWORD }}
-            BITRISE_KEY_ALIAS: ${{ secrets.BITRISE_KEY_ALIAS }}
-            BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
-          run: ./gradlew assembleFdroidDebug --stacktrace
-        - name: Upload apk to github artifacts
-          uses: actions/upload-artifact@v2
-          with:
-            name: wulkanowyDEV-${{ env.RUN_NUMBER }}.apk
-            path: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
-        - name: Deploy to app center
-          uses: wzieba/AppCenter-Github-Action@v1
-          with:
-            appName: wulkanowy/wulkanowy
-            token: ${{ secrets.APP_CENTER_TOKEN }}
-            group: Testers
-            file: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
-            notifyTesters: true
-            debug: true
-
-  deploy-app-distribution:
-      name: Deploy to AppDistribution
-      runs-on: ubuntu-latest
-      timeout-minutes: 10
-      environment: app-distribution
-      if: github.ref == 'refs/heads/develop'
-      steps:
-        - uses: actions/checkout@v2
-        - uses: actions/setup-java@v1
-          with:
-            java-version: 11
-        - uses: actions/cache@v2
-          with:
-            path: |
-              ~/.gradle/caches
-              ~/.gradle/wrapper
-            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-        - name: Set run number with offset
-          env:
-            BUILD_NUMBER_OFFSET: ${{ secrets.BUILD_NUMBER_OFFSET }}
-          run: echo "RUN_NUMBER=$((GITHUB_RUN_NUMBER+BUILD_NUMBER_OFFSET))" >> $GITHUB_ENV
-        - name: Add signing config
-          run: |
-            cat >> app/build.gradle <<EOF
-            android.signingConfigs.debug {
-                storeFile file("bitrise.jks")
-                storePassword System.getenv("BITRISE_KEYSTORE_PASSWORD")
-                keyAlias System.getenv("BITRISE_KEY_ALIAS")
-                keyPassword System.getenv("BITRISE_KEY_PASSWORD")
-            }
-            EOF
-        - name: Decrypt keys
-          env:
-            BITRISE_ENCRYPT_KEY: ${{ secrets.BITRISE_ENCRYPT_KEY }}
-            BITRISE_SERVICES_ENCRYPT_KEY: ${{ secrets.BITRISE_SERVICES_ENCRYPT_KEY }}
-          run: |
-            gpg --yes --batch --passphrase=$BITRISE_SERVICES_ENCRYPT_KEY ./app/src/debug/google-services.json.gpg
-            gpg --yes --batch --passphrase=$BITRISE_ENCRYPT_KEY ./app/bitrise.jks.gpg
-        - name: Bump version
-          uses: chkfung/android-version-actions@v1.1
-          with:
-            gradlePath: app/build.gradle
-            versionCode: ${{ env.RUN_NUMBER }}
-            versionName: ${{ env.RUN_NUMBER }}
-        - name: Build apk
-          env:
-            BITRISE_KEYSTORE_PASSWORD: ${{ secrets.BITRISE_KEYSTORE_PASSWORD }}
-            BITRISE_KEY_ALIAS: ${{ secrets.BITRISE_KEY_ALIAS }}
-            BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
-          run: ./gradlew assemblePlayDebug -PenableFirebase --stacktrace
-        - name: Upload apk to github artifacts
-          uses: actions/upload-artifact@v2
-          with:
-            name: wulkanowyDEV-${{ env.RUN_NUMBER }}-dev.apk
-            path: app/build/outputs/apk/play/debug/app-play-debug.apk
-        - name: Deploy to app distribution
-          uses: wzieba/Firebase-Distribution-Github-Action@v1
-          with:
-            appId: ${{ secrets.FIREBASE_APP_ID }}
-            token: ${{ secrets.FIREBASE_TOKEN }}
-            groups: discord
-            file: app/build/outputs/apk/play/debug/app-play-debug.apk
diff --git a/app/bitrise.jks b/app/bitrise.jks
deleted file mode 100644
index 9d9c11dc7290bd8eca64cf646fb1d4eb34b09e64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2235
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
N-L~|L$t_gB{cjD>@NNJA

diff --git a/app/build.gradle b/app/build.gradle
index fe8f79d8..87863305 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'ru.cian.huawei-publish'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.huawei.agconnect'
@@ -140,6 +141,17 @@ play {
     updatePriority = 3
 }
 
+huaweiPublish {
+    instances {
+        hmsRelease {
+            clientId = System.getenv("AGC_CLIENT_ID")
+            clientSecret = System.getenv("AGC_CLIENT_SECRET")
+            buildFormat = "apk"
+            deployType = "draft"
+        }
+    }
+}
+
 ext {
     work_manager = "2.5.0"
     work_hilt = "1.0.0-beta01"
diff --git a/build.gradle b/build.gradle
index 21ae47e7..222ea177 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,6 +19,7 @@ buildscript {
         classpath 'com.huawei.agconnect:agcp:1.5.1.200'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1'
         classpath "com.github.triplet.gradle:play-publisher:2.8.0"
+        classpath "ru.cian:huawei-publish-gradle-plugin:1.2.2"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"