Skip to content

Commit 08addea

Browse files
committed
Document process for bumping dev-master branch-alias
1 parent 60bd25a commit 08addea

File tree

1 file changed

+30
-1
lines changed

1 file changed

+30
-1
lines changed

CONTRIBUTING.md

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,38 @@ The maintenance branch's HEAD will be the target for our release tag:
124124
$ git tag -a -m "Release X.Y.Z" X.Y.Z
125125
```
126126

127-
### Push tags
127+
### Update branch-alias for dev-master (major and minor releases only)
128+
129+
Initial versions of new major or minor releases will likely be made on the
130+
master branch directly instead of a maintenance branch. In this case, the
131+
`branch-alias` for `dev-master` in `composer.json` should be updated. For
132+
example, after tagging a new 1.10.0 release on the master branch,
133+
`composer.json` in the master branch may still read:
134+
135+
```
136+
"branch-alias": {
137+
"dev-master": "1.9.x-dev"
138+
}
139+
```
140+
141+
The above would be changed to:
142+
143+
```
144+
"branch-alias": {
145+
"dev-master": "1.10.x-dev"
146+
}
147+
```
148+
149+
Commit this change:
128150

129151
```
152+
$ git commit -m "Master is now 1.10-dev" composer.json
153+
```
154+
155+
### Push commits and tags
156+
157+
```
158+
$ git push
130159
$ git push --tags
131160
```
132161

0 commit comments

Comments
 (0)