From dba9f2e2b4d33df89b42c5d2edd9d38ce5fbb744 Mon Sep 17 00:00:00 2001 From: Vaadin Bot Date: Wed, 3 Mar 2021 09:20:28 +0200 Subject: [PATCH] chore: replace the hard coded branch version (#687) (#693) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Manuel Carrasco Moñino Co-authored-by: Zhe Sun <31067185+ZheSun88@users.noreply.github.com> Co-authored-by: Manuel Carrasco Moñino --- scripts/prepareDeploy.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/prepareDeploy.sh b/scripts/prepareDeploy.sh index ed7efc33f1f..581c46c5322 100755 --- a/scripts/prepareDeploy.sh +++ b/scripts/prepareDeploy.sh @@ -48,9 +48,13 @@ pomVersion=`cat pom.xml | grep '' | head -1 | cut -d '>' -f2 | cut -d ' versionBase=`getBaseVersion $version` pomBase=`getBaseVersion $pomVersion` +### Get the master branch version for components +masterPom=`curl -s "https://raw.githubusercontent.com/vaadin/vaadin-flow-components/master/pom.xml"` +masterMajorMinor=`echo "$masterPom" | grep '' | cut -d '>' -f2 |cut -d '<' -f1 | grep "^$base" | head -1 | cut -d '-' -f1` + ### Load versions file for this platform release branch=$versionBase -[ $branch = "20.0" ] && branch=master +[ $branch = $masterMajorMinor ] && branch=master versions=`curl -s "https://raw.githubusercontent.com/vaadin/platform/$branch/versions.json"` [ $? != 0 ] && branch=master && versions=`curl -s "https://raw.githubusercontent.com/vaadin/platform/$branch/versions.json"`