Promote deployment workflow

3 files changed, 11 insertions, 16 deletions

diff --git a/.github/actions/deploy/deploy.sh b/.github/actions/deploy/deploy.sh
index 6408123b9..54b3c9476 100755
--- a/.github/actions/deploy/deploy.sh
+++ b/.github/actions/deploy/deploy.sh
@@ -49,9 +49,6 @@ 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}
 
-./gradlew --stacktrace :deployment:updateDeploymentState -PRequest.apiUsername="${API_USER}" -PRequest.apiUserToken="${API_TOKEN}" \
-          -PrequestStatus.environment="${DEPLOYMENT_ENVIRONMENT}" -PrequestStatus.deployment_id="${DEPLOYMET_ID}" -PrequestStatus.deployment_state="in_progress"
-
 echo "Downloading signature files..."
 if [[ -z "${KEYSTORE_FILE_URL}" ]]; then
     echo "Could not find secure env variable KEYSTORE_FILE_URL. Can not deploy."
@@ -112,9 +109,6 @@ echo "Counter is ${BUILD_COUNT_FOR_VERSION}, crash email: ${ANYSOFTKEYBOARD_CRAS
 
 ./gradlew "${DEPLOY_TASKS[@]}"
 
-./gradlew --stacktrace :deployment:updateDeploymentState -PRequest.apiUsername="${API_USER}" -PRequest.apiUserToken="${API_TOKEN}" \
-          -PrequestStatus.environment="${DEPLOYMENT_ENVIRONMENT}" -PrequestStatus.deployment_id="${DEPLOYMET_ID}" -PrequestStatus.deployment_state="success"
-
 ## TODO: kill previous enabled environments
 
 [[ -n "${GITHUB_ACTIONS}" ]] && chmod -R a+rwx .
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4bb722dcd..beecea34b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -28,6 +28,9 @@ jobs:
           mkdir -p outputs/apks || true
           mkdir -p outputs/fdroid || true
           mkdir -p ime/app/build/outputs/mapping || true
+      - name: status-in-progress
+        if: failure()
+        run: ./gradlew --stacktrace :deployment:updateDeploymentState -PRequest.apiUsername="${{ secrets.BOT_MASTER_RW_GITHUB_USERNAME }}" -PRequest.apiUserToken="${{ secrets.BOT_MASTER_RW_GITHUB_TOKEN }}" -PrequestStatus.environment="${{ github.event.deployment.environment }}" -PrequestStatus.deployment_id="${{ github.event.deployment.id }}" -PrequestStatus.deployment_state="in_progress"
       - uses: ./.github/actions/deploy
         with:
           deployment_id: ${{ github.event.deployment.id }}
@@ -41,6 +44,8 @@ jobs:
           publish_service_account: ${{ secrets.PUBLISH_APK_SERVICE_ACCOUNT_EMAIL }}
           api_user: ${{ secrets.BOT_MASTER_RW_GITHUB_USERNAME }}
           api_token: ${{ secrets.BOT_MASTER_RW_GITHUB_TOKEN }}
+      - name: status-success
+        run: ./gradlew --stacktrace :deployment:updateDeploymentState -PRequest.apiUsername="${{ secrets.BOT_MASTER_RW_GITHUB_USERNAME }}" -PRequest.apiUserToken="${{ secrets.BOT_MASTER_RW_GITHUB_TOKEN }}" -PrequestStatus.environment="${{ github.event.deployment.environment }}" -PrequestStatus.deployment_id="${{ github.event.deployment.id }}" -PrequestStatus.deployment_state="success"
       - name: status-failure
         if: failure()
         run: ./gradlew --stacktrace :deployment:updateDeploymentState -PRequest.apiUsername="${{ secrets.BOT_MASTER_RW_GITHUB_USERNAME }}" -PRequest.apiUserToken="${{ secrets.BOT_MASTER_RW_GITHUB_TOKEN }}" -PrequestStatus.environment="${{ github.event.deployment.environment }}" -PrequestStatus.deployment_id="${{ github.event.deployment.id }}" -PrequestStatus.deployment_state="failure"
diff --git a/buildSrc/src/main/java/deployment/DeploymentRequestProcessTask.java b/buildSrc/src/main/java/deployment/DeploymentRequestProcessTask.java
index 2b7067a64..8d2f9a86d 100644
--- a/buildSrc/src/main/java/deployment/DeploymentRequestProcessTask.java
+++ b/buildSrc/src/main/java/deployment/DeploymentRequestProcessTask.java
@@ -59,20 +59,16 @@ public class DeploymentRequestProcessTask extends DefaultTask {
             throws Exception {
 
         Deployment deployment = new Deployment(data.apiUsername, data.apiUserToken);
-        if (stepIndex == 0) {
-            requestNewDeploy(deployment, data, configuration);
-        } else {
-            throw new UnsupportedOperationException(
-                    "step " + stepIndex + " for " + configuration.name + " is not implemented!");
-        }
+        requestDeploymentAction(deployment, data, configuration, stepIndex);
     }
 
-    private static void requestNewDeploy(
+    private static void requestDeploymentAction(
             Deployment deployment,
             DeploymentCommandLineArgs data,
-            DeploymentProcessConfiguration environment)
+            DeploymentProcessConfiguration environment,
+            int stepIndex)
             throws Exception {
-        final String environmentToDeploy = getEnvironmentName(environment, 0);
+        final String environmentToDeploy = getEnvironmentName(environment, stepIndex);
         final List<String> environmentsToKill =
                 environment.environmentSteps.stream()
                         .map(name -> getEnvironmentName(environment.name, name))
@@ -83,7 +79,7 @@ public class DeploymentRequestProcessTask extends DefaultTask {
                 deployment.requestDeployment(
                         new Deployment.Request(
                                 data.sha,
-                                "deploy",
+                                stepIndex == 0 ? "deploy" : "deploy:migration",
                                 false,
                                 environmentToDeploy,
                                 String.format(