From 9e91a36a37592868141c7d470d64914bf29cb184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Carrasco=20Mo=C3=B1ino?= Date: Tue, 13 Oct 2020 12:13:18 +0200 Subject: [PATCH] ci: fix increasing version for old version schema branches (#226) --- scripts/prepareDeploy.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/prepareDeploy.sh b/scripts/prepareDeploy.sh index 443f2958e9a..2c7e4c3156e 100755 --- a/scripts/prepareDeploy.sh +++ b/scripts/prepareDeploy.sh @@ -19,14 +19,15 @@ getLatest() { getPlatformVersion() { [ "$1" = vaadin-iron-list ] && name="iron-list" || name=$1 + echo "$versions" | jq -r ".core, .vaadin | .[\"$name\"]| .javaVersion" | grep -v null } getNextVersion() { [ -z "$1" ] && return - prefix=`echo $1 | perl -pe 's/[0-1]+$//'` - number=`echo $1 | perl -pe 's/.*([0-1]+)$/$1/'` - number=`expr $number + 1` + prefix=`echo $1 | perl -pe 's/[0-9]+$//'` + number=`echo $1 | perl -pe 's/.*([0-9]+)$/$1/'` + number=`expr $number + 1` || exit 1 echo $prefix$number } @@ -88,6 +89,7 @@ then do modVersion=`getPlatformVersion $i` nextVersion=`getNextVersion $modVersion` + [ "$modVersion" = "$nextVersion" ] && echo Error Increasing version && exit 1 setPomVersion $i $nextVersion done fi