Merge #77005

77005: build: enable required release justifications for stability period r=otan a=celiala To begin stability period for the 22.1 release. Will merge Sunday night. Release justification: non-production code change Release note: None Co-authored-by: Celia La <[email protected]>
cockroachdb · Feb 28, 2022 · 4fa089a · 4fa089a
2 parents 9b45e99 + c20d937
commit 4fa089a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build/teamcity-support.sh b/build/teamcity-support.sh
@@ -310,7 +310,7 @@ generate_ssh_key() {
 maybe_require_release_justification() {
     # Set this to 1 to require a "release justification" note in the commit message
     # or the PR description.
-    require_justification=0
+    require_justification=1
     if [ "$require_justification" = 1 ]; then
         tc_start_block "Ensure commit message contains a release justification"
         # Ensure master branch commits have a release justification.

diff --git a/githooks/commit-msg b/githooks/commit-msg
@@ -52,7 +52,7 @@ IFS='
 notes=($($grep -iE '^release note' "$1"))
 
 # Set this to 1 to require a release justification note.
-require_justification=0
+require_justification=1
 justification=($($grep -iE '^release justification: \S+' "$1"))
 
 IFS=$saveIFS

diff --git a/githooks/prepare-commit-msg b/githooks/prepare-commit-msg
@@ -2,7 +2,7 @@
 #
 # Prepare the commit message by adding a release note.
 
-require_justification=0
+require_justification=1
 set -euo pipefail
 
 if [[ "${2-}" = "message" ]]; then