You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
There was no mention of disabling the merge queue which is needed if we
need to merge a commit (instead of squashing it)
Signed-off-by: Alex Boten <[email protected]>
Copy file name to clipboardExpand all lines: docs/release.md
+7-6
Original file line number
Diff line number
Diff line change
@@ -200,11 +200,12 @@ The following documents the procedure to release a bugfix
200
200
2. Merge the `release/<release-series>` branch into the new branch.
201
201
3. Resolve the conflicts.
202
202
4. Create another pull request to the `main` branch from the new branch to replace the pull request from the `release/<release-series>` branch.
203
-
5. Enable the **Merge pull request** setting in the repository's **Settings** tab.
204
-
6. Make sure you are on `release/<release-series>`. Push the new release version tags for a target module set by running `make push-tags MODSET=<beta|stable>`. Wait for the new tag build to pass successfully.
205
-
7.**IMPORTANT**: The pull request to bring the changes from the release branch *MUST* be merged using the **Merge pull request** method, and *NOT* squashed using “**Squash and merge**”. This is important as it allows us to ensure the commit SHA from the release branch is also on the main branch. **Not following this step will cause much go dependency sadness.**
206
-
8. If the pull request was created from the `release/<release-series>` branch, it will be auto-deleted. Restore the release branch via GitHub.
207
-
9. Once the patch is released, disable the **Merge pull request** setting.
203
+
5. Disable the merge queue. An admin of the repo needs to be available for this.
204
+
6. Enable the **Merge pull request** setting in the repository's **Settings** tab.
205
+
7. Make sure you are on `release/<release-series>`. Push the new release version tags for a target module set by running `make push-tags MODSET=<beta|stable>`. Wait for the new tag build to pass successfully.
206
+
8.**IMPORTANT**: The pull request to bring the changes from the release branch *MUST* be merged using the **Merge pull request** method, and *NOT* squashed using “**Squash and merge**”. This is important as it allows us to ensure the commit SHA from the release branch is also on the main branch. **Not following this step will cause much go dependency sadness.**
207
+
9. If the pull request was created from the `release/<release-series>` branch, it will be auto-deleted. Restore the release branch via GitHub.
208
+
10. Once the patch is released, disable the **Merge pull request** setting and re-enable the merge queue.
208
209
209
210
## 1.0 release
210
211
@@ -216,7 +217,6 @@ Once a module is ready to be released under the `1.x` version scheme, file a PR
0 commit comments