Pull branch sooner to ensure release version is correctly guessed

hughns · Jan 2, 2023 · 5ee3eef · 5ee3eef
1 parent b3d578d
commit 5ee3eef
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/tools/release/releaseScript.sh b/tools/release/releaseScript.sh
@@ -87,6 +87,14 @@ fi
 
 printf "OK\n"
 
+printf "\n================================================================================\n"
+printf "Ensuring main and develop branches are up to date...\n"
+
+git checkout main
+git pull
+git checkout develop
+git pull
+
 printf "\n================================================================================\n"
 # Guessing version to propose a default version
 versionMajorCandidate=`grep "ext.versionMajor" ./vector-app/build.gradle | cut  -d " " -f3`
@@ -103,14 +111,6 @@ versionMinor=`echo ${version} | cut  -d "." -f2`
 versionPatch=`echo ${version} | cut  -d "." -f3`
 nextPatchVersion=$((versionPatch + 2))
 
-printf "\n================================================================================\n"
-printf "Ensuring main and develop branches are up to date...\n"
-
-git checkout main
-git pull
-git checkout develop
-git pull
-
 printf "\n================================================================================\n"
 printf "Starting the release ${version}\n"
 git flow release start ${version}