diff --git a/.github/release-please.yml b/.github/release-please.yml index d0d8ce428c..45821c154c 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -26,3 +26,7 @@ branches: bumpMinorPreMajor: true handleGHRelease: true branch: 6.23.x + - releaseType: java-yoshi + bumpMinorPreMajor: true + handleGHRelease: true + branch: 6.33.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 87ddc5b58d..167e52ec6d 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -107,6 +107,20 @@ branchProtectionRules: - checkstyle - compile (8) - compile (11) + - pattern: 6.33.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - lint + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - checkstyle + - compile (8) + - compile (11) permissionRules: - team: yoshi-admins permission: admin