diff --git a/.github/release-please.yml b/.github/release-please.yml index 8b04a0c2d..16dd2cbd1 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -2,8 +2,14 @@ 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 + extraFiles: + - src/main/java/com/google/cloud/logging/logback/LoggingAppender.java + branch: 0.133.x extraFiles: - - src/main/java/com/google/cloud/logging/logback/LoggingAppender.java + - src/main/java/com/google/cloud/logging/logback/LoggingAppender.java diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 6c0f2cd60..8c609347d 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -32,6 +32,21 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google + - pattern: 0.133.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - javadoc + - unmanaged_dependency_check permissionRules: - team: yoshi-admins permission: admin