Deploy-Request Gradle task and definition of promoting steps

10 files changed, 160 insertions, 200 deletions

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d6f99749e..8ae18906e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
-* @AnySoftKeyboard/infra @AnySoftKeyboard/maintainers
+* @AnySoftKeyboard/maintainers
 #only organization owner can change the license
 /LICENSE @menny
 #core infra structure team can approve github configuration
diff --git a/.github/actions/deploy-request/action.yml b/.github/actions/deploy-request/action.yml
deleted file mode 100644
index 2ac16e04f..000000000
--- a/.github/actions/deploy-request/action.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: "deployment-request"
-author: "menny"
-description: "Performs a deploy request"
-
-inputs:
-  ref:
-    description: "ref (branch) to publish"
-    required: true
-  sha:
-    description: "commit to deploy"
-    required: true
-  api_user_name:
-    description: "the username to use for API calls"
-    required: true
-  api_user_token:
-    description: "the user API token to use for API calls"
-    required: true
-  reports_folder:
-    description: "Where to store requests and responses files."
-    required: true
-
-runs:
-  using: "docker"
-  image: "docker://menny/ndk_ask:1.13.6"
-  entrypoint: /bin/bash
-  args:
-    - .github/actions/deploy-request/request.sh
-    - ${{ inputs.ref }}
-    - ${{ inputs.sha }}
-    - ${{ inputs.api_user_name }}
-    - ${{ inputs.api_user_token }}
-    - ${{ inputs.reports_folder }}
-
-branding:
-  icon: 'package'
-  color: 'purple'
diff --git a/.github/actions/deploy-request/request.sh b/.github/actions/deploy-request/request.sh
deleted file mode 100755
index d526f76f4..000000000
--- a/.github/actions/deploy-request/request.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-REF_TO_DEPLOY="${1}"
-#we are using exact SHA to deploy, and not branc (which can move)
-SHA_TO_DEPLOY="${2}"
-API_USERNAME="${3}"
-API_TOKEN="${4}"
-OUTPUT="${5}"
-
-rm -rf "${OUTPUT}" || true
-mkdir -p "${OUTPUT}"
-
-function deployment_request() {
-  echo "making request to: ${1}"
-  local JSON_TEXT
-  JSON_TEXT=$( jq -n \
-                    --arg jsonRef "${SHA_TO_DEPLOY}" \
-                    --arg jsonDeployTarget "${1}" \
-                    --arg jsonDescription "${2}" \
-                    '{ ref: $jsonRef, task: "deploy", auto_merge: false, environment: $jsonDeployTarget, description: $jsonDescription, required_contexts: [ "master-green-requirement" ] }' )
-
-  local JSON_FILENAME="${OUTPUT}/deployment_request_${1}.json"
-  echo "${JSON_TEXT}" > "${JSON_FILENAME}"
-  cat "${JSON_FILENAME}"
-  set +e
-  curl --fail -u "${API_USERNAME}:${API_TOKEN}" -o "${OUTPUT}/deployment_response_${1}.json" -d "@${JSON_FILENAME}" https://api.github.com/repos/AnySoftKeyboard/AnySoftKeyboard/deployments
-  local curl_exit_code=$?
-  set -e
-  echo "response with exit-code ${curl_exit_code}:"
-  cat "${OUTPUT}/deployment_response_${1}.json"
-  if [[ ${curl_exit_code} -ne 0 ]]; then
-    exit ${curl_exit_code}
-  fi
-}
-
-#some deploy logic
-if [[ "${REF_TO_DEPLOY}" == "refs/heads/master" ]]; then
-  deployment_request "app_alpha" "Deployment request by ${API_USERNAME}"
-  deployment_request "addons_alpha" "Deployment request by ${API_USERNAME}"
-elif [[ "${REF_TO_DEPLOY}" == "release-branch-v"* ]]; then
-  deployment_request "app_beta" "Deployment request by ${API_USERNAME}"
-fi
diff --git a/.github/actions/deploy-status/action.yml b/.github/actions/deploy-status/action.yml
deleted file mode 100644
index bb4592f0c..000000000
--- a/.github/actions/deploy-status/action.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: "deployment-status"
-author: "menny"
-description: "updates deployment status"
-
-inputs:
-  deployment_id:
-    description: "deployment-id"
-    required: true
-  state:
-    description: "commit to deploy"
-    required: true
-  environment:
-    description: "environment to deploy"
-    required: true
-  api_user_name:
-    description: "the username to use for API calls"
-    required: true
-  api_user_token:
-    description: "the user API token to use for API calls"
-    required: true
-
-runs:
-  using: "docker"
-  image: "docker://menny/ndk_ask:1.13.6"
-  entrypoint: /bin/bash
-  args:
-    - .github/actions/deploy-status/request.sh
-    - ${{ inputs.deployment_id }}
-    - ${{ inputs.environment }}
-    - ${{ inputs.state }}
-    - ${{ inputs.api_user_name }}
-    - ${{ inputs.api_user_token }}
-
-branding:
-  icon: 'package'
-  color: 'purple'
diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml
index 8463f089a..f13035251 100644
--- a/.github/actions/deploy/action.yml
+++ b/.github/actions/deploy/action.yml
@@ -3,27 +3,45 @@ description: "Deploys the AnySoftKeyboard artifacts to Play Store"
 author: "menny"
 
 inputs:
-  deploy_target:
-    description: "Target to deploy. Should something deploy-request github-action outputs"
+  deployment_id:
+    description: "ID given by github"
+    required: true
+  deployment_environment:
+    description: "Deploy to which environment"
+    required: true
+  deployment_task:
+    description: "Deployment task"
+    required: true
+  api_user:
+    description: "github API user"
+    required: true
+  api_token:
+    description: "github API user token"
     required: true
   crash_report_email:
     default: "none@example.com"
-    required: false
+    description: "email address for crash reporting "
+    required: true
   keystore_url:
     default: ""
-    required: false
+    description: "direct download URL to APK signing keystore"
+    required: true
   keystore_password:
     default: ""
-    required: false
+    description: "APK signing keystore password"
+    required: true
   keystore_key_password:
     default: ""
-    required: false
+    description: "APK signing keystore default key password"
+    required: true
   publish_service_account_creds_url:
+    description: "direct download URL to Play-Store credentials file"
     default: ""
-    required: false
+    required: true
   publish_service_account:
+    description: "account for Play-Store API"
     default: ""
-    required: false
+    required: true
 runs:
   using: "docker"
   image: "docker://menny/ndk_ask:1.13.6"
@@ -35,13 +53,17 @@ runs:
   entrypoint: /bin/bash
   args:
     - .github/actions/deploy/deploy.sh
-    - ${{ inputs.deploy_target }}
+    - ${{ inputs.deployment_id }}
+    - ${{ inputs.deployment_environment }}
+    - ${{ inputs.deployment_task }}
     - ${{ inputs.crash_report_email }}
     - ${{ inputs.keystore_url }}
     - ${{ inputs.keystore_password }}
     - ${{ inputs.keystore_key_password }}
     - ${{ inputs.publish_service_account_creds_url }}
     - ${{ inputs.publish_service_account }}
+    - ${{ inputs.api_user }}
+    - ${{ inputs.api_token }}
 
 branding:
   icon: 'upload-cloud'
diff --git a/.github/actions/deploy/deploy.sh b/.github/actions/deploy/deploy.sh
index 8bea7d299..f7d47a0d5 100755
--- a/.github/actions/deploy/deploy.sh
+++ b/.github/actions/deploy/deploy.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 set -e
-
-DEPLOY_TARGET="${1}"
+DEPLOYMET_ID="${1}"
+shift
+DEPLOYMENT_ENVIRONMENT="${1}"
+shift
+DEPLOYMENT_TASK="${1}"
 shift
 export ANYSOFTKEYBOARD_CRASH_REPORT_EMAIL="${1}"
 shift
@@ -15,61 +18,101 @@ PUBLISH_CERT_FILE_URL="${1}"
 shift
 export PUBLISH_APK_SERVICE_ACCOUNT_EMAIL="${1}"
 shift
+API_USER="${1}"
+shift
+API_TOKEN="${1}"
+shift
 
+function deployProcessFromEnvironmentName() {
+    #imeMaster_alpha_100
+    [[ $1 =~ ([a-zA-Z]+)_.*_.* ]]
+    echo "${BASH_REMATCH[1]}"
+}
+
+function deployChannelFromEnvironmentName() {
+    #imeMaster_alpha_100
+    [[ $1 =~ .*_([a-zA-Z]+)_.* ]]
+    echo "${BASH_REMATCH[1]}"
+}
+
+function deployFractionFromEnvironmentName() {
+    #imeMaster_alpha_100
+    [[ $1 =~ .*_.*_([0-9]+) ]]
+    local PERCENTAGE="${BASH_REMATCH[1]}"
+    echo "$(echo "${PERCENTAGE}" | cut -c1-1).$(echo "${PERCENTAGE}" | cut -c2-3)"
+}
+
+PROCESS_NAME=$(deployProcessFromEnvironmentName "${DEPLOYMENT_ENVIRONMENT}")
+DEPLOY_CHANNEL=$(deployChannelFromEnvironmentName "${DEPLOYMENT_ENVIRONMENT}")
+FRACTION=$(deployFractionFromEnvironmentName "${DEPLOYMENT_ENVIRONMENT}")
+
+echo "for ${DEPLOYMENT_ENVIRONMENT}: will deploy process ${PROCESS_NAME} to ${DEPLOY_CHANNEL} with ${FRACTION} fraction."
 export BUILD_COUNT_FOR_VERSION=${GITHUB_RUN_NUMBER}
 
+./.github/actions/deploy/status-request.sh "${DEPLOYMET_ID}" "${DEPLOYMENT_ENVIRONMENT}" "in-progress" "${API_USER}" "${API_TOKEN}"
+
+echo "Downloading signature files..."
 if [[ -z "${KEYSTORE_FILE_URL}" ]]; then
-    echo "Using debug keystore for signing."
-    mkdir -p /root/.android/ || true
-    cp ./.github/actions/deploy/debug.keystore /root/.android/ || exit 1
+    echo "Could not find secure env variable KEYSTORE_FILE_URL. Can not deploy."
+    exit 1
 fi
 
-DEPLOY_TASKS=( "-PwithAutoVersioning" ":generateFdroidYamls" )
-case "${DEPLOY_TARGET}" in
-  dry-run)
-    DEPLOY_TASKS+=( "-DdeployChannel=alpha" "assembleRelease" "assembleCanary" "verifyReleaseResources" "generateReleasePlayResources" "generateCanaryPlayResources" )
-    ;;
+if [[ -z "${PUBLISH_CERT_FILE_URL}" ]]; then
+    echo "Could not find secure env variable PUBLISH_CERT_FILE_URL. Can not deploy."
+    exit 1
+fi
 
-  app_alpha)
-    DEPLOY_TASKS+=( "-DdeployChannel=alpha" "ime:app:assembleCanary" "ime:app:publishCanary" )
-    ;;
+wget --tries=5 --waitretry=5 "${KEYSTORE_FILE_URL}" -q -O /tmp/anysoftkeyboard.keystore
+stat /tmp/anysoftkeyboard.keystore
+wget --tries=5 --waitretry=5 "${PUBLISH_CERT_FILE_URL}" -q -O /tmp/apk_upload_key.p12
+stat /tmp/apk_upload_key.p12
 
-  app_beta)
-    DEPLOY_TASKS+=( "-DdeployChannel=beta" "ime:app:assembleRelease" "ime:app:publishRelease")
-    ;;
+DEPLOY_TASKS=( "-PwithAutoVersioning" ":generateFdroidYamls" "-DdeployChannel=${DEPLOY_CHANNEL}" "--user-fraction" "${FRACTION}" )
+if [[ "${DEPLOYMENT_TASK}" == "deploy" ]]; then
+  case "${PROCESS_NAME}" in
 
-  addons_alpha)
-    DEPLOY_TASKS+=( "-DdeployChannel=alpha" "assembleRelease" "publishRelease" "-x" "ime:app:assembleRelease" "-x" "ime:app:publishRelease" )
-    ;;
+    imeMaster)
+      DEPLOY_TASKS+=( "ime:app:assembleCanary" "ime:app:publishCanary" )
+      ;;
 
-  *)
-    echo "deploy-target '${DEPLOY_TARGET}' is unkown!"
-    exit 1
-    ;;
-esac
+    imeProduction)
+      DEPLOY_TASKS+=( "ime:app:assembleRelease" "ime:app:publishRelease" )
+      ;;
+
+    addOns)
+      DEPLOY_TASKS+=( "assembleRelease" "publishRelease" "-x" "ime:app:assembleRelease" "-x" "ime:app:publishRelease" )
+      ;;
 
-echo "Counter is ${BUILD_COUNT_FOR_VERSION}, DEPLOY_TARGET: ${DEPLOY_TARGET}, crash email: ${ANYSOFTKEYBOARD_CRASH_REPORT_EMAIL}, and tasks: ${DEPLOY_TASKS[*]}"
+    *)
+      echo "PROCESS_NAME '${PROCESS_NAME}' is unknown in task ${DEPLOYMENT_TASK}!"
+      exit 1
+      ;;
 
-if [[ "${DEPLOY_TASKS[*]}" == *"publish"* ]]; then
-    echo "Downloading signature files..."
+  esac
+elif [[ "${DEPLOYMENT_TASK}" == "deploy:migration" ]]; then
+  case "${PROCESS_NAME}" in
 
-    if [[ -z "${KEYSTORE_FILE_URL}" ]]; then
-        echo "Could not find secure env variable KEYSTORE_FILE_URL. Can not deploy."
-        exit 1
-    fi
+    imeMaster)
+      DEPLOY_TASKS+=( "ime:app:promoteReleaseArtifact" )
+      ;;
 
-    if [[ -z "${PUBLISH_CERT_FILE_URL}" ]]; then
-        echo "Could not find secure env variable PUBLISH_CERT_FILE_URL. Can not deploy."
-        exit 1
-    fi
+    imeProduction)
+      DEPLOY_TASKS+=( "ime:app:promoteReleaseArtifact" )
+      ;;
 
-    wget --tries=5 --waitretry=5 "${KEYSTORE_FILE_URL}" -q -O /tmp/anysoftkeyboard.keystore
-    stat /tmp/anysoftkeyboard.keystore
-    wget --tries=5 --waitretry=5 "${PUBLISH_CERT_FILE_URL}" -q -O /tmp/apk_upload_key.p12
-    stat /tmp/apk_upload_key.p12
+    addOns)
+      DEPLOY_TASKS+=( "promoteReleaseArtifact" "-x" "ime:app:promoteReleaseArtifact" )
+      ;;
+
+  esac
 fi
 
-# shellcheck disable=SC2086
+echo "Counter is ${BUILD_COUNT_FOR_VERSION}, crash email: ${ANYSOFTKEYBOARD_CRASH_REPORT_EMAIL}, and tasks: ${DEPLOY_TASKS[*]}"
+
 ./gradlew "${DEPLOY_TASKS[@]}"
 
+./.github/actions/deploy/status-request.sh "${DEPLOYMET_ID}" "${DEPLOY_TARGET}" "success" "${API_USER}" "${API_TOKEN}"
+
+## TODO: kill previous enabled environments
+
 [[ -n "${GITHUB_ACTIONS}" ]] && chmod -R a+rwx .
diff --git a/.github/actions/deploy-status/request.sh b/.github/actions/deploy/status-request.sh
index f2be576f9..f2be576f9 100755
--- a/.github/actions/deploy-status/request.sh
+++ b/.github/actions/deploy/status-request.sh
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index f50c93807..f23635919 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -165,7 +165,6 @@ jobs:
           path: build-logging
 
   deploy-dry-run:
-    if: github.event_name == 'pull_request'
     runs-on: ubuntu-18.04
     container: menny/ndk_ask:1.13.6
     steps:
@@ -178,9 +177,12 @@ jobs:
             dry-run-deploy-gradle-
       - name: setup
         run: ./scripts/ci/ci_setup.sh
-      - uses: ./.github/actions/deploy
-        with:
-          deploy_target: dry-run
+      - name: dry-run-release-build
+        run: |
+          mkdir -p /root/.android/ || true
+          cp ./.github/actions/deploy/debug.keystore /root/.android/ || exit 1
+          ./gradlew -PwithAutoVersioning :generateFdroidYamls -DdeployChannel=alpha assembleRelease assembleCanary verifyReleaseResources generateReleasePlayResources generateCanaryPlayResources
+          chmod -R a+rwx .
       - uses: actions/upload-artifact@v1.0.0
         with:
           name: fdroid-metadata-dry-run
@@ -190,19 +192,17 @@ jobs:
     needs: [checks, app-all-sdks-tests, app-tests-shards, app-less-tests, deploy-dry-run]
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v2
+      - name: ready
+        run: echo "DONE"
 
   deploy-request:
     if: github.event_name == 'push'
     needs: [master-green-requirement]
     runs-on: ubuntu-18.04
-    container: menny/ndk_ask:1.13.6
+    container: menny/android_base:1.13.6
     steps:
       - uses: actions/checkout@v2
-      - uses: ./.github/actions/deploy-request
-        with:
-          ref: ${{ github.ref }}
-          sha: ${{ github.sha }}
-          api_user_name: ${{ secrets.BOT_MASTER_RW_GITHUB_USERNAME }}
-          api_user_token: ${{ secrets.BOT_MASTER_RW_GITHUB_TOKEN }}
-          reports_folder: build/deploy-reports
+      - name: request-new-deploys
+        run: |
+          ./gradlew :deployment:imeOnMasterPush :deployment:addOnsOnMasterPush \
+              -PrequestDeploy.sha=${{ github.sha }} -PrequestDeploy.api_user_name=${{ secrets.BOT_MASTER_RW_GITHUB_USERNAME }} -PrequestDeploy.api_user_token=${{ secrets.BOT_MASTER_RW_GITHUB_TOKEN }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f44c86db2..c4f92dfdc 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -22,13 +22,6 @@ jobs:
         with:
           name: github_object
           path: build/github_object
-      - uses: ./.github/actions/deploy-status
-        with:
-          deployment_id: ${{ github.event.deployment.id }}
-          state: in_progress
-          environment: ${{ github.event.deployment.environment }}
-          api_user_name: ${{ secrets.BOT_MASTER_RW_GITHUB_USERNAME }}
-          api_user_token: ${{ secrets.BOT_MASTER_RW_GITHUB_TOKEN }}
       - name: setup
         run: |
           ./scripts/ci/ci_setup.sh
@@ -37,29 +30,25 @@ jobs:
           mkdir -p ime/app/build/outputs/mapping || true
       - uses: ./.github/actions/deploy
         with:
-          deploy_target: ${{ github.event.deployment.environment }}
+          deployment_id: ${{ github.event.deployment.id }}
+          deployment_environment: ${{ github.event.deployment.environment }}
+          deployment_task: ${{ github.event.deployment.task }}
           crash_report_email: ${{ secrets.ANYSOFTKEYBOARD_CRASH_REPORT_EMAIL }}
           keystore_url: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_URL }}
           keystore_password: ${{ secrets.ANYSOFTKEYBOARD_KEYSTORE_PASSWORD }}
           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-status
-        if: success()
-        with:
-          deployment_id: ${{ github.event.deployment.id }}
-          state: success
-          environment: ${{ github.event.deployment.environment }}
-          api_user_name: ${{ secrets.BOT_MASTER_RW_GITHUB_USERNAME }}
-          api_user_token: ${{ secrets.BOT_MASTER_RW_GITHUB_TOKEN }}
-      - uses: ./.github/actions/deploy-status
+          api_user: ${{ secrets.BOT_MASTER_RW_GITHUB_USERNAME }}
+          api_token: ${{ secrets.BOT_MASTER_RW_GITHUB_TOKEN }}
+      - name: status-failure
         if: failure()
+        run: ./.github/actions/deploy/status-request.sh "${{ github.event.deployment.id }}" "${{ github.event.deployment.environment }}" "failure" "${{ secrets.BOT_MASTER_RW_GITHUB_USERNAME }}" "${{ secrets.BOT_MASTER_RW_GITHUB_TOKEN }}"
+      - uses: actions/upload-artifact@v1.0.0
+        if: always()
         with:
-          deployment_id: ${{ github.event.deployment.id }}
-          state: failure
-          environment: ${{ github.event.deployment.environment }}
-          api_user_name: ${{ secrets.BOT_MASTER_RW_GITHUB_USERNAME }}
-          api_user_token: ${{ secrets.BOT_MASTER_RW_GITHUB_TOKEN }}
+          name: deploy-logging
+          path: build-logging
       - uses: actions/upload-artifact@v1.0.0
         with:
           name: apks
diff --git a/.github/workflows/deployment_promote.yml b/.github/workflows/deployment_promote.yml
new file mode 100644
index 000000000..b7940f188
--- /dev/null
+++ b/.github/workflows/deployment_promote.yml
@@ -0,0 +1,21 @@
+name: deployment
+
+#always run on the default branch: master
+on:
+  schedule:
+    - cron: '04 04 * * *'
+
+env:
+  TERM: dumb
+  GRADLE_OPTS: "-Dorg.gradle.daemon=false --stacktrace"
+
+jobs:
+  promote-alpha:
+    runs-on: ubuntu-18.04
+    container: menny/android_base:1.13.6
+    steps:
+      - uses: actions/checkout@v2
+      - name: requets-pre-release-promote
+        run: |
+          ./gradlew :deployment:imePromoteMaster :deployment:addOnsPromoteMaster \
+              -PrequestDeploy.sha=${{ github.sha }} -PrequestDeploy.api_user_name=${{ secrets.BOT_MASTER_RW_GITHUB_USERNAME }} -PrequestDeploy.api_user_token=${{ secrets.BOT_MASTER_RW_GITHUB_TOKEN }}