Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(version): update bump version flow [EE-6267] #547

Merged
merged 2 commits into from
Nov 8, 2023
Merged

feat(version): update bump version flow [EE-6267] #547

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecb79ea
feat(version): update bump version script
oscarzhou-portainer Nov 7, 2023
5cb1730
fix(script): update bump version helper
oscarzhou-portainer Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 42 additions & 5 deletions bump_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@ fi
CURRENT_VERSION=$(grep -i "^\s*Version\s*=" agent.go | sed 's/^.* \(".*"$\)/\1/' | xargs)
PROMPT=true

function IsReleaseBranch() {
current_branch=$(git rev-parse --abbrev-ref HEAD)

# Check if the branch is prefixed with "release"
if [[ $current_branch == release* ]]; then
return 0
fi

return 1
}

# Parse the major, minor and patch versions
# out.
# You use it like this:
Expand All @@ -28,14 +39,25 @@ function ParseSemVer() {
local major=0
local minor=0
local patch=0
local pre_release=""

if [[ "$token" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+) ]]; then
betaRegex="([0-9]+)\.([0-9]+)\.([0-9]+)-([a-zA-Z0-9.-]+)"
if [[ "$token" =~ $betaRegex ]]; then
major=${BASH_REMATCH[1]}
minor=${BASH_REMATCH[2]}
patch=${BASH_REMATCH[3]}
fi
pre_release=${BASH_REMATCH[4]}

echo "$major $minor $patch"
echo "$major $minor $patch $pre_release"

elif [[ "$token" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+) ]]; then

major=${BASH_REMATCH[1]}
minor=${BASH_REMATCH[2]}
patch=${BASH_REMATCH[3]}

echo "$major $minor $patch"
fi
}

Help()
Expand All @@ -44,6 +66,12 @@ Help()
echo
echo "The Portainer Agent version is in the semantic version format:"
echo " X.Y.Z (Major.Minor.Patch)"
echo "A beta version is indicated by a pre-release tag:"
echo " X.Y.Z-beta.0 (Major.Minor.Patch-beta.Revision)"
echo
echo "The order of bumping is:"
echo "x.x.x -> x.x+1.0-beta.1 -> x.x+1.0-beta.1 -> x.x+1.0"
echo "(2.19.0 -> 2.19.1 -> 2.20.0-beta.1 -> 2.20.0-beta.2 -> 2.20.0)"
echo
echo "The current version is defined in multiple files."
echo "This script will update the version in the following files:"
Expand Down Expand Up @@ -77,8 +105,17 @@ major=${a[0]}
minor=${a[1]}
patch=${a[2]}

minor=$(($minor+1))
NEW_VERSION="${major}.${minor}.${patch}"
len=${#a[@]}
if [[ $len > 3 ]]; then
NEW_VERSION="${major}.${minor}.${patch}"
else
if IsReleaseBranch; then
NEW_VERSION="${major}.${minor}.${patch}-beta.1"
else
minor=$((minor+1))
NEW_VERSION="${major}.${minor}.${patch}"
fi
fi

[ $PROMPT == true ] && {
echo -n "New Portainer Agent version: [${NEW_VERSION}]: "
Expand Down
Loading