chore(release-scripts): split BranchPattern from BranchVersion

petebacondarwin · petebacondarwin · commit 299b3e7e0164 · 2015-01-14T20:36:17.000Z
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
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angularjs",`
`3`		`- "branchVersion": "1.4.*",`
	`3`	`+ "branchVersion": "^1.4.0-beta.0",`
	`4`	`+ "branchPattern": "1.4.*",`
`4`	`5`	`"repository": {`
`5`	`6`	`"type": "git",`
`6`	`7`	`"url": "https://github.com/angular/angular.js.git"`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ ARG_DEFS=(`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`function checkVersionNumber() {`
`20`		`- BRANCH_PATTERN=$(readJsonProp "package.json" "branchVersion")`
	`20`	`+ BRANCH_PATTERN=$(readJsonProp "package.json" "branchPattern")`
`21`	`21`	`if [[ $VERSION_NUMBER != $BRANCH_PATTERN ]]; then`
`22`	`22`	`echo "version-number needs to match $BRANCH_PATTERN on this branch"`
`23`	`23`	`usage`