Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

separate out version suffix #6396

Merged
merged 5 commits into from
Nov 27, 2018

Conversation

wanderingbort
Copy link
Contributor

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

VERSION="@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@"

VERSION_NO_SUFFIX="@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@"
VERSION_SUFFIX="@VERSION_SUFFIX"
Copy link
Contributor

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
Copy link
Contributor

@emorybarlow emorybarlow Nov 27, 2018

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.

Copy link
Contributor Author

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

Copy link
Contributor

@emorybarlow emorybarlow Nov 27, 2018

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)

@wanderingbort wanderingbort merged commit 7b833db into release/1.5.x Nov 27, 2018
@wanderingbort wanderingbort deleted the feature/separate-release-suffix branch November 27, 2018 21:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants