From: Michal Nowak Date: Thu, 2 Mar 2023 10:42:45 +0000 (+0100) Subject: Move "disallow merging to maintained branches" closer to tagging X-Git-Tag: v9.19.11~2^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b08e54a0d201241e697ce063e9d8c506ad25e5c4;p=thirdparty%2Fbind9.git Move "disallow merging to maintained branches" closer to tagging Updating GitLab settings for all maintained branches to disallow merging to them has an unfortunate consequence: daily scheduled pipelines won't be executed anymore. This is a problem because we need the pipelines to ensure no new bugs were introduced just before a code freeze. The "Announce (on Mattermost) that the code freeze is in effect" item is still in place but is now more of a social "disallow merging to maintained branches". --- diff --git a/.gitlab/issue_templates/Release.md b/.gitlab/issue_templates/Release.md index 16cc0c73b8b..6243739f7d6 100644 --- a/.gitlab/issue_templates/Release.md +++ b/.gitlab/issue_templates/Release.md @@ -36,7 +36,6 @@ - [ ] ***(QA)*** Check whether all issues assigned to the release milestone are resolved[^1]. - [ ] ***(QA)*** Ensure that there are no outstanding merge requests in the private repository[^1] (Subscription Edition only). - [ ] ***(QA)*** Ensure all merge requests marked for backporting have been indeed backported. - - [ ] ***(QA)*** Update GitLab settings for all maintained branches to disallow merging to them. - [ ] ***(QA)*** Announce (on Mattermost) that the code freeze is in effect. ### Before the Tagging Deadline @@ -46,6 +45,7 @@ - [ ] ***(QA)*** Add a release marker to `CHANGES.SE` (Subscription Edition only). - [ ] ***(QA)*** Update BIND 9 version in `configure.ac` (9.18+) or `version` (9.16). - [ ] ***(QA)*** Rebuild `configure` using Autoconf on `docs.isc.org` (9.16). + - [ ] ***(QA)*** Update GitLab settings for all maintained branches to disallow merging to them. - [ ] ***(QA)*** Tag the releases in the private repository (`git tag -s -m "BIND 9.x.y" v9_x_y`). ### Before the ASN Deadline (for ASN Releases) or the Public Release Date (for Regular Releases)