Merge pull request #1295 from wulkanowy/rbo/update-workflow

Update github action workflow

.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;

.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

.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 ]
+    branches: [ master, develop ]
-
-  workflow_dispatch:
 
 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

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"

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"