From 1d2f478a6042cf8e4785111cfb3f1f6684b30b4b Mon Sep 17 00:00:00 2001
From: Thiago Nunes <thiagotnunes@google.com>
Date: Mon, 3 May 2021 17:04:44 +1000
Subject: [PATCH] chore: adds branch 3.3.x as stable (#1123)

* chore: adds branch 3.3.x as stable

Also removes clirr / linkage monitor from non master branches since they
only work for the master branch.

* chore: adds branch 3.3.x to release please config
---
 .github/release-please.yml      |  3 +++
 .github/sync-repo-settings.yaml | 31 +++++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 30330ae516..d7589c23da 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -4,6 +4,9 @@ branches:
 - branch: 3.1.x
   releaseType: java-yoshi
   bumpMinorPreMajor: true
+- branch: 3.3.x
+  releaseType: java-yoshi
+  bumpMinorPreMajor: true
 - branch: 4.0.x
   releaseType: java-yoshi
   bumpMinorPreMajor: true
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 11a26167e3..dff2e8609b 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -57,9 +57,32 @@ branchProtectionRules:
   requiredStatusCheckContexts:
     - "dependencies (8)"
     - "dependencies (11)"
-    - "linkage-monitor"
     - "lint"
-    - "clirr"
+    - "units (7)"
+    - "units (8)"
+    - "units (11)"
+    - "Kokoro - Test: Integration"
+    - "cla/google"
+
+# Identifies the protection rule pattern. Name of the branch to be protected.
+# Defaults to `master`
+- pattern: 3.3.x
+  # Can admins overwrite branch protection.
+  # Defaults to `true`
+  isAdminEnforced: true
+  # Number of approving reviews required to update matching branches.
+  # Defaults to `1`
+  requiredApprovingReviewCount: 1
+  # Are reviews from code owners required to update matching branches.
+  # Defaults to `false`
+  requiresCodeOwnerReviews: true
+  # Require up to date branches
+  requiresStrictStatusChecks: false
+  # List of required status check contexts that must pass for commits to be accepted to matching branches.
+  requiredStatusCheckContexts:
+    - "dependencies (8)"
+    - "dependencies (11)"
+    - "lint"
     - "units (7)"
     - "units (8)"
     - "units (11)"
@@ -84,9 +107,7 @@ branchProtectionRules:
   requiredStatusCheckContexts:
     - "dependencies (8)"
     - "dependencies (11)"
-    - "linkage-monitor"
     - "lint"
-    - "clirr"
     - "units (7)"
     - "units (8)"
     - "units (11)"
@@ -111,9 +132,7 @@ branchProtectionRules:
   requiredStatusCheckContexts:
     - "dependencies (8)"
     - "dependencies (11)"
-    - "linkage-monitor"
     - "lint"
-    - "clirr"
     - "units (7)"
     - "units (8)"
     - "units (11)"