filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull branch sooner to ensure release version is correctly guessed

This commit is contained in:
Benoit Marty 2023-01-02 16:55:25 +01:00
parent b3d578d6b8
commit 5ee3eefe96
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/release/releaseScript.sh
View File

@ -87,6 +87,14 @@ fi
printf "OK\n" 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" printf "\n================================================================================\n"
# Guessing version to propose a default version # Guessing version to propose a default version
versionMajorCandidate=`grep "ext.versionMajor" ./vector-app/build.gradle | cut -d " " -f3` 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` versionPatch=`echo ${version} | cut -d "." -f3`
nextPatchVersion=$((versionPatch + 2)) 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 "\n================================================================================\n"
printf "Starting the release ${version}\n" printf "Starting the release ${version}\n"
git flow release start ${version} git flow release start ${version}