From cbaa36f85ab676be77f0a6157cf812c6916b8503 Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Fri, 27 Sep 2024 12:04:30 -0700
Subject: [PATCH 1/2] Use loop to verify web deploy

---
 .github/scripts/verifyDeploy.sh | 34 +++++++++++++++++++++++++++++++++
 .github/workflows/deploy.yml    | 16 ++--------------
 2 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100755 .github/scripts/verifyDeploy.sh

diff --git a/.github/scripts/verifyDeploy.sh b/.github/scripts/verifyDeploy.sh
new file mode 100755
index 000000000000..51986979e188
--- /dev/null
+++ b/.github/scripts/verifyDeploy.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+ENV="$1"
+EXPECTED_VERSION="$2"
+
+BASE_URL=""
+if [[ "$ENV" == 'staging' ]]; then
+  BASE_URL='https://staging.new.expensify.com'
+else
+  BASE_URL='https://new.expensify.com'
+fi
+
+sleep 5
+ATTEMPT=0
+MAX_ATTEMPTS=10
+while [[ $ATTEMPT -lt $MAX_ATTEMPTS ]]; do
+  ((ATTEMPT++))
+
+  echo "Attempt $ATTEMPT: Checking deployed version..."
+  DOWNLOADED_VERSION="$(wget -q -O /dev/stdout "$BASE_URL"/version.json | jq -r '.version')"
+
+  if [[ "$EXPECTED_VERSION" == "$DOWNLOADED_VERSION" ]]; then
+    echo "Success: Deployed version matches local version: $DOWNLOADED_VERSION"
+    exit 0
+  fi
+
+  if [[ $ATTEMPT -lt $MAX_ATTEMPTS ]]; then
+    echo "Version mismatch. Retrying in 5 seconds..."
+    sleep 5
+  fi
+done
+
+echo "Error: Deployed version did not match local version after $MAX_ATTEMPTS attempts. Something went wrong..."
+exit 1
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index df3143368d2e..99cd0c1dabc5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -386,23 +386,11 @@ jobs:
 
       - name: Verify staging deploy
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: |
-          sleep 5
-          DOWNLOADED_VERSION="$(wget -q -O /dev/stdout https://staging.new.expensify.com/version.json | jq -r '.version')"
-          if [[ '${{ needs.prep.outputs.APP_VERSION }}' != "$DOWNLOADED_VERSION" ]]; then
-            echo "Error: deployed version $DOWNLOADED_VERSION does not match local version ${{ needs.prep.outputs.APP_VERSION }}. Something went wrong..."
-            exit 1
-          fi
+        run: ./.github/scripts/verifyDeploy.sh staging ${{ needs.prep.outputs.APP_VERSION }}
 
       - name: Verify production deploy
         if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: |
-          sleep 5
-          DOWNLOADED_VERSION="$(wget -q -O /dev/stdout https://new.expensify.com/version.json | jq -r '.version')"
-          if [[ '${{ needs.prep.outputs.APP_VERSION }}' != "$DOWNLOADED_VERSION" ]]; then
-            echo "Error: deployed version $DOWNLOADED_VERSION does not match local version ${{ needs.prep.outputs.APP_VERSION }}. Something went wrong..."
-            exit 1
-          fi
+        run: ./.github/scripts/verifyDeploy.sh production ${{ needs.prep.outputs.APP_VERSION }}
 
       - name: Upload web sourcemaps artifact
         uses: actions/upload-artifact@v4

From 2ccaacc3cbc8ba64115dfe13781df72d713c79b5 Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Fri, 27 Sep 2024 13:17:59 -0700
Subject: [PATCH 2/2] Update .github/scripts/verifyDeploy.sh

Co-authored-by: Andrew Gable <andrew@expensify.com>
---
 .github/scripts/verifyDeploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/verifyDeploy.sh b/.github/scripts/verifyDeploy.sh
index 51986979e188..0a8fd3c97bcf 100755
--- a/.github/scripts/verifyDeploy.sh
+++ b/.github/scripts/verifyDeploy.sh
@@ -25,7 +25,7 @@ while [[ $ATTEMPT -lt $MAX_ATTEMPTS ]]; do
   fi
 
   if [[ $ATTEMPT -lt $MAX_ATTEMPTS ]]; then
-    echo "Version mismatch. Retrying in 5 seconds..."
+    echo "Version mismatch, found $DOWNLOADED_VERSION. Retrying in 5 seconds..."
     sleep 5
   fi
 done