Skip to content

fix generating pre-release deb/rpm versions when using '.' #700

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

Merged
thaJeztah merged 1 commit into from
May 24, 2022
Merged

fix generating pre-release deb/rpm versions when using '.' #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions deb/gen-deb-ver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ gen_deb_version() {
increment="$3"
testVersion="${fullVersion#*-$pattern}"
baseVersion="${fullVersion%-"$pattern"*}"
echo "$baseVersion-$increment.$testVersion.$pattern$testVersion"
echo "$baseVersion-$increment.${testVersion##.}.$pattern$testVersion"
}

case "$debVersion" in
*-dev)
;;
*-tp[0-9]*)
*-tp[.0-9]*)
debVersion="$(gen_deb_version "$debVersion" tp 0)"
;;
*-beta[0-9]*)
*-beta[.0-9]*)
debVersion="$(gen_deb_version "$debVersion" beta 1)"
;;
*-rc[0-9]*)
*-rc[.0-9]*)
debVersion="$(gen_deb_version "$debVersion" rc 2)"
;;
*)
Expand Down
18 changes: 9 additions & 9 deletions rpm/gen-rpm-ver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ rpmRelease=3
# Docker 18.01.0-ce-cs1-rc1: version=18.01.0.ce.cs1, release=0.1.rc1
# Docker 18.01.0-ce-dev nightly: version=18.01.0.ce, release=0.0.YYYYMMDD.HHMMSS.gitHASH

if [[ "$rpmVersion" =~ .*-tp[0-9]+$ ]]; then
tpVersion=${rpmVersion#*-tp}
if [[ "$rpmVersion" =~ .*-tp[.0-9]+$ ]]; then
testVersion=${rpmVersion#*-tp}
rpmVersion=${rpmVersion%-tp*}
rpmRelease="0.${tpVersion}.tp${tpVersion}"
elif [[ "$rpmVersion" =~ .*-beta[0-9]+$ ]]; then
betaVersion=${rpmVersion#*-beta}
rpmRelease="0.${testVersion##.}.tp${testVersion}"
elif [[ "$rpmVersion" =~ .*-beta[.0-9]+$ ]]; then
testVersion=${rpmVersion#*-beta}
rpmVersion=${rpmVersion%-beta*}
rpmRelease="1.${betaVersion}.beta${betaVersion}"
elif [[ "$rpmVersion" =~ .*-rc[0-9]+$ ]]; then
rcVersion=${rpmVersion#*-rc}
rpmRelease="1.${testVersion##.}.beta${testVersion}"
elif [[ "$rpmVersion" =~ .*-rc[.0-9]+$ ]]; then
testVersion=${rpmVersion#*-rc}
rpmVersion=${rpmVersion%-rc*}
rpmRelease="2.${rcVersion}.rc${rcVersion}"
rpmRelease="2.${testVersion##.}.rc${testVersion}"
fi

DOCKER_GITCOMMIT=$($GIT_COMMAND rev-parse --short HEAD)
Expand Down