Skip to content

Commit 299b3e7

Browse files
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
1 parent 54cae0f commit 299b3e7

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "angularjs",
3-
"branchVersion": "1.4.*",
3+
"branchVersion": "^1.4.0-beta.0",
4+
"branchPattern": "1.4.*",
45
"repository": {
56
"type": "git",
67
"url": "https://github.com/angular/angular.js.git"

scripts/angular.js/tag-release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ARG_DEFS=(
1717
)
1818

1919
function checkVersionNumber() {
20-
BRANCH_PATTERN=$(readJsonProp "package.json" "branchVersion")
20+
BRANCH_PATTERN=$(readJsonProp "package.json" "branchPattern")
2121
if [[ $VERSION_NUMBER != $BRANCH_PATTERN ]]; then
2222
echo "version-number needs to match $BRANCH_PATTERN on this branch"
2323
usage

0 commit comments

Comments
 (0)