From 299b3e7e016498813ca7b71a218ad0f29e790394 Mon Sep 17 00:00:00 2001 From: Peter Bacon Darwin Date: Wed, 14 Jan 2015 20:36:17 +0000 Subject: [PATCH] chore(release-scripts): split BranchPattern from BranchVersion The release scripts need the BranchPattern to be of the form: 1.4.* so that they can match the version using Regex. The doc gen scripts need a SemVer pattern that will match beta releases. The convention is that 1.4.x is not satisfied by 1.4.0.beta.0 --- package.json | 3 ++- scripts/angular.js/tag-release.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 75f286bf6..d8b79d45d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "angularjs", - "branchVersion": "1.4.*", + "branchVersion": "^1.4.0-beta.0", + "branchPattern": "1.4.*", "repository": { "type": "git", "url": "https://github.com/angular/angular.js.git" diff --git a/scripts/angular.js/tag-release.sh b/scripts/angular.js/tag-release.sh index fbb6e2def..ec8d6747e 100755 --- a/scripts/angular.js/tag-release.sh +++ b/scripts/angular.js/tag-release.sh @@ -17,7 +17,7 @@ ARG_DEFS=( ) function checkVersionNumber() { - BRANCH_PATTERN=$(readJsonProp "package.json" "branchVersion") + BRANCH_PATTERN=$(readJsonProp "package.json" "branchPattern") if [[ $VERSION_NUMBER != $BRANCH_PATTERN ]]; then echo "version-number needs to match $BRANCH_PATTERN on this branch" usage