diff --git a/.github/release-please.yml b/.github/release-please.yml index ab97340a7..7f8c0fbb7 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -23,6 +23,10 @@ branches: handleGHRelease: true releaseType: java-backport branch: 2.35.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 2.40.x bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 418e8ab98..2027cd1a0 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -107,6 +107,21 @@ branchProtectionRules: - cla/google - OwlBot Post Processor - javadoc + - pattern: 2.40.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - OwlBot Post Processor + - javadoc permissionRules: - team: api-bigquery permission: admin