Full deployment workflow

2 files changed, 41 insertions, 131 deletions

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 6021af870..fd1860dd6 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -173,7 +173,8 @@ jobs:
             dry-run-deploy-gradle-
       - uses: ./.github/actions/deploy
         with:
-          deploy_tasks: "-DdeployChannel=alpha assembleRelease assembleCanary verifyReleaseResources generateReleasePlayResources generateCanaryPlayResources :generateFdroidYamls"
+          ref: ${{ github.ref }}
+          deploy_target: dry-run
       - uses: actions/upload-artifact@v1.0.0
         with:
           name: fdroid-metadata-dry-run
@@ -181,7 +182,7 @@ jobs:
 
   deploy-request:
     if: github.event_name == 'push'
-    needs: [setup, checks, app-all-sdks-tests, app-tests-shards, app-less-tests, deploy-dry-run]
+    needs: [setup, checks, app-all-sdks-tests, app-tests-shards, app-less-tests]
     runs-on: ubuntu-18.04
     steps:
       - uses: ./.github/actions/deploy-request
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 350e34af7..39b589dd8 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,4 +1,4 @@
-name: checks
+name: deployment
 
 on:
   deployment
@@ -9,12 +9,12 @@ env:
   GRADLE_USER_HOME: ".github_cache_gradle/"
 
 jobs:
-  debug:
+  deploy:
     runs-on: ubuntu-18.04
     container: menny/ndk_ask:1.13.1
     steps:
       - uses: actions/checkout@v2
-      - name: debug
+      - name: setup
         env:
           GITHUB_CONTEXT_JSON: ${{ toJson(github) }}
 
@@ -28,129 +28,38 @@ jobs:
           echo "CONTEXT: "
           echo "${GITHUB_CONTEXT_JSON}"
           ./scripts/ci/ci_setup.sh
-
-#  deploy_canary_ime_for_master:
-#    if: github.ref == 'refs/heads/master'
-#    needs: [green-branch-check]
-#    runs-on: ubuntu-18.04
-#    container: menny/ndk_ask:1.13.1
-#    steps:
-#      - uses: actions/checkout@v2
-#      - name: Get green-branch
-#        uses: actions/download-artifact@v1.0.0
-#        with:
-#          name: green-branch
-#      - name: deploy-neeeded
-#        run: |
-#          if [[ "TRUE" == "$(cat green-branch.txt)" ]]; then
-#            echo "branch is green"
-#            touch deploy_yes
-#          else
-#            echo "branch is not green"
-#          fi
-#      - name: deploy
-#        uses: ./.github/actions/deploy
-#        with:
-#          deploy_approval_filename: deploy_yes
-#          deploy_tasks: "-DdeployChannel=alpha ime:app:assembleCanary ime:app:publishCanary"
-#          crash_report_email: ${{ secrets.ANYSOFTKEYBOARD_CRASH_REPORT_EMAIL }}
-#          keystore_url: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_URL }}
-#          keystore_password: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_PASSWORD }}
-#          keystore_key_alias: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_ALIAS }}
-#          keystore_key_password: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_KEY_PASSWORD }}
-#          publish_service_account_creds_url: ${{ secrets.PUBLISH_CERT_FILE_URL }}
-#          publish_service_account: ${{ secrets.PUBLISH_APK_SERVICE_ACCOUNT_EMAIL }}
-#      - uses: actions/upload-artifact@v1.0.0
-#        with:
-#          name: signed-apk-canary-ime
-#          path: ime/app/build/outputs/apk
-#      - uses: actions/upload-artifact@v1.0.0
-#        with:
-#          name: proguard-mapping-canary-ime
-#          path: ime/app/build/outputs/mapping
-#
-#  deploy_release_ime:
-#    if: startsWith(github.ref, 'release-branch-v')
-#    needs: [green-branch-check]
-#    runs-on: ubuntu-18.04
-#    container: menny/ndk_ask:1.13.1
-#    steps:
-#      - uses: actions/checkout@v2
-#      - name: Get green-branch
-#        uses: actions/download-artifact@v1.0.0
-#        with:
-#          name: green-branch
-#      - name: deploy
-#        run: |
-#          if [[ "TRUE" == "$(cat green-branch.txt)" ]]; then
-#            echo "branch is green"
-#            touch deploy_yes
-#          else
-#            echo "branch is not green"
-#          fi
-#      - name: setup-beta-release-notes
-#        run: |
-#          cp ime/app/src/main/play/release-notes/en-US/alpha.txt ime/app/src/main/play/release-notes/en-US/beta.txt
-#      - name: deploy
-#        uses: ./.github/actions/deploy
-#        with:
-#          deploy_approval_filename: deploy_yes
-#          deploy_tasks: "-DdeployChannel=beta ime:app:assembleRelease ime:app:publishRelease :generateFdroidYamls"
-#          crash_report_email: ${{ secrets.ANYSOFTKEYBOARD_CRASH_REPORT_EMAIL }}
-#          keystore_url: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_URL }}
-#          keystore_password: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_PASSWORD }}
-#          keystore_key_alias: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_ALIAS }}
-#          keystore_key_password: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_KEY_PASSWORD }}
-#          publish_service_account_creds_url: ${{ secrets.PUBLISH_CERT_FILE_URL }}
-#          publish_service_account: ${{ secrets.PUBLISH_APK_SERVICE_ACCOUNT_EMAIL }}
-#      - uses: actions/upload-artifact@v1.0.0
-#        with:
-#          name: signed-apk-release-ime
-#          path: ime/app/build/outputs/apk
-#      - uses: actions/upload-artifact@v1.0.0
-#        with:
-#          name: proguard-mapping-release-ime
-#          path: ime/app/build/outputs/mapping
-#      - uses: actions/upload-artifact@v1.0.0
-#        with:
-#          name: fdroid-metadata-release-ime
-#          path: outputs/fdroid
-#
-#  deploy_release_addons:
-#    if: github.ref == 'refs/heads/master'
-#    needs: [green-branch-check]
-#    runs-on: ubuntu-18.04
-#    container: menny/ndk_ask:1.13.1
-#    steps:
-#      - uses: actions/checkout@v2
-#      - name: Get green-branch
-#        uses: actions/download-artifact@v1.0.0
-#        with:
-#          name: green-branch
-#      - name: deploy-switch
-#        run: |
-#          if [[ "TRUE" == "$(cat green-branch.txt)" ]]; then
-#            echo "branch is green"
-#            touch deploy_yes
-#          else
-#            echo "branch is not green"
-#          fi
-#      - name: deploy
-#        uses: ./.github/actions/deploy
-#        with:
-#          deploy_approval_filename: deploy_yes
-#          deploy_tasks: "-DdeployChannel=alpha assembleRelease publishRelease -x ime:app:assembleRelease -x ime:app:publishRelease :generateFdroidYamls"
-#          keystore_url: ${{ secrets.PACK_KEYSTORE_URL }}
-#          keystore_password: ${{ secrets.PACK_KEYSTORE_PASSWORD }}
-#          keystore_key_alias: ${{ secrets.PACK_KEYSTORE_ALIAS }}
-#          keystore_key_password: ${{ secrets.PACK_KEYSTORE_KEY_PASSWORD }}
-#          publish_service_account_creds_url: ${{ secrets.PUBLISH_CERT_FILE_URL }}
-#          publish_service_account: ${{ secrets.PUBLISH_APK_SERVICE_ACCOUNT_EMAIL }}
-#      - uses: actions/upload-artifact@v1.0.0
-#        with:
-#          name: signed-add-ons-apks
-#          path: outputs/apks/release
-#      - uses: actions/upload-artifact@v1.0.0
-#        with:
-#          name: fdroid-addons-metadata
-#          path: outputs/fdroid
+      - uses: ./.github/actions/deploy
+        if: ${{ startsWith(github.event.environment, 'app') }}
+        with:
+          deploy_target: ${{ github.event.environment }}
+          crash_report_email: ${{ secrets.ANYSOFTKEYBOARD_CRASH_REPORT_EMAIL }}
+          keystore_url: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_URL }}
+          keystore_password: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_PASSWORD }}
+          keystore_key_alias: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_ALIAS }}
+          keystore_key_password: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_KEY_PASSWORD }}
+          publish_service_account_creds_url: ${{ secrets.PUBLISH_CERT_FILE_URL }}
+          publish_service_account: ${{ secrets.PUBLISH_APK_SERVICE_ACCOUNT_EMAIL }}
+      - uses: ./.github/actions/deploy
+        if: ${{ startsWith(github.event.environment, 'addons') }}
+        with:
+          deploy_target: ${{ github.event.environment }}
+          crash_report_email: ${{ secrets.ANYSOFTKEYBOARD_CRASH_REPORT_EMAIL }}
+          keystore_url: ${{ secrets.PACK_KEYSTORE_URL }}
+          keystore_password: ${{ secrets.PACK_KEYSTORE_PASSWORD }}
+          keystore_key_alias: ${{ secrets.PACK_KEYSTORE_ALIAS }}
+          keystore_key_password: ${{ secrets.PACK_KEYSTORE_KEY_PASSWORD }}
+          publish_service_account_creds_url: ${{ secrets.PUBLISH_CERT_FILE_URL }}
+          publish_service_account: ${{ secrets.PUBLISH_APK_SERVICE_ACCOUNT_EMAIL }}
+      - uses: actions/upload-artifact@v1.0.0
+        with:
+          name: apks
+          path: outputs/apks
+      - uses: actions/upload-artifact@v1.0.0
+        if: ${{ startsWith(github.event.environment, 'app') }}
+        with:
+          name: proguard-mapping
+          path: ime/app/build/outputs/mapping
+      - uses: actions/upload-artifact@v1.0.0
+        with:
+          name: fdroid-metadata
+          path: outputs/fdroid