Skip to content

Commit 0be1877

Browse files
authored
Document process for bumping dev-master branch-alias and bump to 1.10-dev (#852)
1 parent 60bd25a commit 0be1877

File tree

2 files changed

+32
-1
lines changed

2 files changed

+32
-1
lines changed

CONTRIBUTING.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,37 @@ repository:
8383
informational log messages with the `--level warning` option.
8484
* Generated documentation may be found in the `build/master/html` directory.
8585

86+
## Creating a maintenance branch and updating master branch alias
87+
88+
After releasing a new major or minor version (e.g. 1.9.0), a maintenance branch
89+
(e.g. v1.9) should be created. Any development towards a patch release (e.g.
90+
1.9.1) would then be done within that branch and any development for the next
91+
major or minor release can continue in master.
92+
93+
After creating a maintenance branch, the `extra.branch-alias.dev-master` field
94+
in the master branch's `composer.json` file should be updated. For example,
95+
after branching v1.9, `composer.json` in the master branch may still read:
96+
97+
```
98+
"branch-alias": {
99+
"dev-master": "1.9.x-dev"
100+
}
101+
```
102+
103+
The above would be changed to:
104+
105+
```
106+
"branch-alias": {
107+
"dev-master": "1.10.x-dev"
108+
}
109+
```
110+
111+
Commit this change:
112+
113+
```
114+
$ git commit -m "Master is now 1.10-dev" composer.json
115+
```
116+
86117
## Releasing
87118

88119
The follow steps outline the release process for a maintenance branch (e.g.

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"extra": {
3333
"branch-alias": {
34-
"dev-master": "1.9.x-dev"
34+
"dev-master": "1.10.x-dev"
3535
}
3636
}
3737
}

0 commit comments

Comments
 (0)