@@ -41,15 +41,10 @@ changes in this maintenance branch. This is important because we will later
41
41
merge the ensuing release commits up to master with ` --strategy=ours ` , which
42
42
will ignore changes from the merged commits.
43
43
44
- ## Update composer.json and CI matrices
44
+ ## Update CI matrices
45
45
46
46
This is especially important before releasing a new minor version.
47
47
48
- Ensure that the extension requirement and branch alias in ` composer.json ` are
49
- correct for the library version being released. For example, the 1.15.0 release
50
- of the library should depend on version ` ^1.15.0 ` of the extension and master
51
- branch alias should be ` 1.15.x-dev ` .
52
-
53
48
If this is the first release of a minor version for the library, it is likely
54
49
following an extension release. The ` vars ` for calling ` compile extension ` from
55
50
` build-extension.yml ` in the Evergreen configuration must be updated:
@@ -90,21 +85,22 @@ After releasing a new major or minor version (e.g. 1.9.0), a maintenance branch
90
85
1.9.1) would then be done within that branch and any development for the next
91
86
major or minor release can continue in master.
92
87
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:
88
+ When work begins on a major new version, create a maintenance branch for the
89
+ last minor version and update the ` extra.branch-alias.dev-master ` field
90
+ in the master branch's ` composer.json ` file. For example, after branching v1.99,
91
+ ` composer.json ` in the master branch may still read:
96
92
97
93
```
98
94
"branch-alias": {
99
- "dev-master": "1.9. x-dev"
95
+ "dev-master": "1.x-dev"
100
96
}
101
97
```
102
98
103
99
The above would be changed to:
104
100
105
101
```
106
102
"branch-alias": {
107
- "dev-master": "1.10 .x-dev"
103
+ "dev-master": "2 .x-dev"
108
104
}
109
105
```
110
106
@@ -124,24 +120,6 @@ $ git checkout -b vX.Y
124
120
$ git push mongodb vX.Y
125
121
```
126
122
127
- Update the master branch alias in ` composer.json ` :
128
-
129
- ``` diff
130
- "extra": {
131
- "branch-alias": {
132
- - "dev-master": "1.15.x-dev"
133
- + "dev-master": "1.16.x-dev"
134
- }
135
- },
136
- ```
137
-
138
- Commit and push this change:
139
-
140
- ``` console
141
- $ git commit -m " Master is now X.Y-dev" composer.json
142
- $ git push mongodb
143
- ```
144
-
145
123
### After releasing a patch version
146
124
147
125
If this was a patch release, the maintenance branch must be merged up to master:
0 commit comments