-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Conversation
scripts/generate_package.sh.in
Outdated
VERSION="@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@" | ||
|
||
VERSION_NO_SUFFIX="@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@" | ||
VERSION_SUFFIX="@VERSION_SUFFIX" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be @VERSION_SUFFIX@
? I don't think it will be interpolated properly without the trailing @
.
if [[ -z $RELEASE ]]; then | ||
RELEASE="1" | ||
NAME="${NAME}-1" | ||
fi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For consistency I think we want the release as part of the name regardless of whether its set or not. Could we move setting NAME below the check for RELEASE and make it NAME="${PROJECT}-${VERSION}-${RELEASE}"
? And then remove setting the NAME from within the check for RELEASE.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, I agree thats more readable but, I did want to note that "${VERSION}" comes suffixed so
"${PROJECT}-${VERSION}-${RELEASE}" would interpolate to EOSIO-1.5.0-rc1-rc1
or EOSIO-1.5.0-1
depending on whether the suffix was present. I adjusted it to use VERSION_NO_SUFFIX in the update
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I see it now. Either way is fine with me. (The way you had it originally or the way you have it now)
Change Description
RPM packages were failing because the version was not properly formed when the suffix was included.
This moves the suffix of a release into its own variable and provides an unsuffixed version number to the package building scripts when needed
Consensus Changes
API Changes
Documentation Additions