Backport PR #12728 to 7.x: [Build] Fix version script when VERSION_QUALIFIER is empty string (#12729)

Backport PR #12728 to 7.x branch

Prior to this release a VERSION_QUALIFER env set to an empty string
would create versions looking like `8.0.0--SNAPSHOT` instead of
`8.0.0-SNAPSHOT`, causing the release manager builds to fail.
This commit is contained in:
Rob Bavey 2021-03-05 10:43:04 -05:00 committed by GitHub
parent 01b2f14337
commit 5a24847a28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -12,7 +12,7 @@ end
def qualify(version)
qualifier = ENV['VERSION_QUALIFIER']
qualifier ? [version, qualifier].join("-") : version
qualifier.nil? || qualifier.empty? ? version : [version, qualifier].join("-")
end
def get_version