Merge pull request Expensify#64848 from Expensify/Rory-FixAndroidBuilds

[No QA] Make previous rollout adjustments non-critical

Author: Julesssss

.github/workflows/deploy.yml

@@ -180,20 +180,15 @@ jobs:
           GOOGLE_KEY_FILE: ./android-fastlane-json-key.json
           PACKAGE_NAME: org.me.mobiexpensifyg
 
+      # Complete the previous version rollout if the current rollout percentage is not -1 (no rollout in progress) or 1 (fully rolled out)
+      - name: Submit previous production build to 100%
+        if: ${{ github.ref == 'refs/heads/production' && !contains(fromJSON('["1", "-1"]'), steps.getAndroidRolloutPercentage.outputs.CURRENT_ROLLOUT_PERCENTAGE) }}
+        run: bundle exec fastlane android complete_hybrid_rollout
+        continue-on-error: true
+
       - name: Submit production build for Google Play review and a slow rollout
         if: ${{ github.ref == 'refs/heads/production' }}
-        run: |
-          # Complete the previous version rollout if the current rollout percentage is not -1 (no rollout in progress) or 1 (fully rolled out)
-          echo "Current rollout percentage: ${{ steps.getAndroidRolloutPercentage.outputs.CURRENT_ROLLOUT_PERCENTAGE }}"
-          if [[ ${{ steps.getAndroidRolloutPercentage.outputs.CURRENT_ROLLOUT_PERCENTAGE }} != '-1' && ${{ steps.getAndroidRolloutPercentage.outputs.CURRENT_ROLLOUT_PERCENTAGE }} != '1' ]]; then
-            echo "Completing the previous version rollout"
-              bundle exec fastlane android complete_hybrid_rollout
-          else
-              echo "Skipping the completion of the previous version rollout"
-          fi
-
-          # Submit the new version for review and slow rollout when it's approved
-          bundle exec fastlane android upload_google_play_production_hybrid_rollout
+        run: bundle exec fastlane android upload_google_play_production_hybrid_rollout
         env:
           VERSION: ${{ steps.getAndroidVersion.outputs.VERSION_CODE }}
 
@@ -433,14 +428,14 @@ jobs:
         if: ${{ fromJSON(env.IS_APP_REPO) && fromJSON(env.SHOULD_BUILD_APP) }}
         run: bundle exec fastlane ios upload_dsyms_hybrid
 
-      - name: Submit production build for App Store review and a slow rollout
+      - name: Submit previous production build to 100%
         if: ${{ github.ref == 'refs/heads/production' }}
-        run: |
-          # Complete the previous version rollout
-          bundle exec fastlane ios complete_hybrid_rollout
+        run: bundle exec fastlane ios complete_hybrid_rollout
+        continue-on-error: true
 
-          # Submit the new version for review and phased rollout when it's approved
-          bundle exec fastlane ios submit_hybrid_for_rollout
+      - name: Submit production build for App Store review and a slow rollout
+        if: ${{ github.ref == 'refs/heads/production' }}
+        run: bundle exec fastlane ios submit_hybrid_for_rollout
         env:
           VERSION: ${{ steps.getIOSVersion.outputs.IOS_VERSION }}
           APPLE_ID: ${{ vars.APPLE_ID }}