From 90328b1eba8d6c2d4958e0733319214add15f234 Mon Sep 17 00:00:00 2001
From: Vince Grassia <593223+vgrassia@users.noreply.github.com>
Date: Mon, 12 Feb 2024 10:35:35 -0500
Subject: [PATCH] Fix while loop logic (#7910)

---
 .github/workflows/version-bump.yml | 32 +++++++++++-------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml
index 11df107932e..b955e729d55 100644
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -322,15 +322,13 @@ jobs:
         env:
           NEW_VERSION: ${{ inputs.version_number }}
         run: |
-          CURRENT_VERSION=$(cat package.json | jq -r '.version')
-
           # Wait for version to change.
-          while [[ "$NEW_VERSION" != "$CURRENT_VERSION" ]]
           do
             echo "Waiting for version to be updated..."
-            sleep 10
             git pull --force
-          done
+            CURRENT_VERSION=$(cat package.json | jq -r '.version')
+            sleep 10
+          done while [[ "$NEW_VERSION" != "$CURRENT_VERSION" ]]
         working-directory: apps/browser
 
       ### CLI
@@ -339,15 +337,13 @@ jobs:
         env:
           NEW_VERSION: ${{ inputs.version_number }}
         run: |
-          CURRENT_VERSION=$(cat package.json | jq -r '.version')
-
           # Wait for version to change.
-          while [[ "$NEW_VERSION" != "$CURRENT_VERSION" ]]
           do
             echo "Waiting for version to be updated..."
-            sleep 10
             git pull --force
-          done
+            CURRENT_VERSION=$(cat package.json | jq -r '.version')
+            sleep 10
+          done while [[ "$NEW_VERSION" != "$CURRENT_VERSION" ]]
         working-directory: apps/cli
 
       ### Desktop
@@ -356,15 +352,13 @@ jobs:
         env:
           NEW_VERSION: ${{ inputs.version_number }}
         run: |
-          CURRENT_VERSION=$(cat package.json | jq -r '.version')
-
           # Wait for version to change.
-          while [[ "$NEW_VERSION" != "$CURRENT_VERSION" ]]
           do
             echo "Waiting for version to be updated..."
-            sleep 10
             git pull --force
-          done
+            CURRENT_VERSION=$(cat package.json | jq -r '.version')
+            sleep 10
+          done while [[ "$NEW_VERSION" != "$CURRENT_VERSION" ]]
         working-directory: apps/desktop
 
       ### Web
@@ -373,15 +367,13 @@ jobs:
         env:
           NEW_VERSION: ${{ inputs.version_number }}
         run: |
-          CURRENT_VERSION=$(cat package.json | jq -r '.version')
-
           # Wait for version to change.
-          while [[ "$NEW_VERSION" != "$CURRENT_VERSION" ]]
           do
             echo "Waiting for version to be updated..."
-            sleep 10
             git pull --force
-          done
+            CURRENT_VERSION=$(cat package.json | jq -r '.version')
+            sleep 10
+          done while [[ "$NEW_VERSION" != "$CURRENT_VERSION" ]]
         working-directory: apps/web
 
       - name: Cut RC branch