From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 11 Feb 2020 18:09:44 +0000 (-0800) Subject: Look for any branch starting with release (#7087) (#7089) X-Git-Tag: v2.9.4~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7378%2Fhead;p=thirdparty%2FChart.js.git Look for any branch starting with release (#7087) (#7089) --- diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 35ae4d4e4..b5ff1d6dc 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -8,7 +8,7 @@ TARGET_REPO_URL="https://$GITHUB_AUTH_TOKEN@github.com/chartjs/chartjs.github.io VERSION_REGEX='[[:digit:]]+.[[:digit:]]+.[[:digit:]]+(-.*)?' # Make sure that this script is executed only for the release and master branches -if [ "$TRAVIS_BRANCH" == "release" ]; then +if [ "$TRAVIS_BRANCH" =~ ^release.*$ ]; then # Travis executes this script from the repository root, so at the same level than package.json VERSION=$(node -p -e "require('./package.json').version") elif [ "$TRAVIS_BRANCH" == "master" ]; then diff --git a/scripts/release.sh b/scripts/release.sh index 71f588034..13686b4d7 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -2,7 +2,7 @@ set -e -if [ "$TRAVIS_BRANCH" != "release" ]; then +if [[ ! "$TRAVIS_BRANCH" =~ ^release.*$ ]]; then echo "Skipping release because this is not the 'release' branch" exit 0 fi