From cdd906fecdf69ae63ffdbeeb4f743feb3489d171 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Tue, 30 Apr 2019 10:24:14 -0700 Subject: [PATCH] 8222913: Add Jib support for VERSION_EXTRA* Reviewed-by: tbell, mikael --- make/conf/jib-profiles.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js index 7761de7275f..4a3cdc3536c 100644 --- a/make/conf/jib-profiles.js +++ b/make/conf/jib-profiles.js @@ -1283,7 +1283,10 @@ var getVersion = function (feature, interim, update, patch) { var version = (feature != null ? feature : version_numbers.get("DEFAULT_VERSION_FEATURE")) + "." + (interim != null ? interim : version_numbers.get("DEFAULT_VERSION_INTERIM")) + "." + (update != null ? update : version_numbers.get("DEFAULT_VERSION_UPDATE")) - + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH")); + + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH")) + + "." + version_numbers.get("DEFAULT_VERSION_EXTRA1") + + "." + version_numbers.get("DEFAULT_VERSION_EXTRA2") + + "." + version_numbers.get("DEFAULT_VERSION_EXTRA3"); while (version.match(".*\\.0$")) { version = version.substring(0, version.length - 2); }