diff --git a/.github/release-please.yml b/.github/release-please.yml index 893d1405bf..42bf1c67e8 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -2,6 +2,10 @@ bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi branches: - - branch: java7 - - branch: protobuf-4.x-rc - manifest: true + - branch: java7 + - branch: protobuf-4.x-rc + manifest: true + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 3.36.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 2fd98aad18..81c1a896c2 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -38,6 +38,26 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google + - pattern: 3.36.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - 'Kokoro - Test: Integration Against Named DB' + - cla/google + - 'Kokoro - Test: Java GraalVM Native Image A' + - 'Kokoro - Test: Java GraalVM Native Image B' + - 'Kokoro - Test: Java GraalVM Native Image C' + - javadoc + - library_generation + - unmanaged_dependency_check permissionRules: - team: yoshi-admins permission: admin