diff --git a/.github/release-please.yml b/.github/release-please.yml index c117556ed1..e42bd9d1a5 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -3,4 +3,13 @@ bumpMinorPreMajor: true handleGHRelease: true primaryBranch: main manifest: true -extraFiles: ["WORKSPACE", ".cloudbuild/graalvm/cloudbuild.yaml", ".cloudbuild/graalvm/cloudbuild-test-a.yaml", ".cloudbuild/graalvm/cloudbuild-test-b.yaml"] +extraFiles: ["WORKSPACE", ".cloudbuild/graalvm/cloudbuild.yaml", ".cloudbuild/graalvm/cloudbuild-test-a.yaml", ".cloudbuild/graalvm/cloudbuild-test-b.yaml", ".cloudbuild/library_generation/cloudbuild-library-generation-release.yaml", "generation_config.yaml"] +branches: + - branch: 2.23.x + releaseType: java-backport + manifest: true + handleGHRelease: true + - branch: 2.40.x + releaseType: java-backport + manifest: true + handleGHRelease: true diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 835aa157d4..4e71b4eabc 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -2,37 +2,79 @@ rebaseMergeAllowed: true squashMergeAllowed: true mergeCommitAllowed: false branchProtectionRules: -- pattern: main - isAdminEnforced: true - requiredApprovingReviewCount: 1 - requiresCodeOwnerReviews: true - requiresStrictStatusChecks: false - requiredStatusCheckContexts: - - build(8) except for gapic-generator-java - - build(8) for gapic-generator-java - - build (11) - - build (17) - - cla/google - - compatibility - - graalvm-presubmit-sdk-platform-java-a (java-graalvm-ci-prod) - - graalvm-presubmit-sdk-platform-java-b (java-graalvm-ci-prod) - - graalvm-presubmit-sdk-platform-java-a-downstream-kms (java-graalvm-ci-prod) - - graalvm-presubmit-sdk-platform-java-b-downstream-kms (java-graalvm-ci-prod) - - graalvm-presubmit-sdk-platform-java-a-downstream-kmsinventory (java-graalvm-ci-prod) - - graalvm-presubmit-sdk-platform-java-b-downstream-kmsinventory (java-graalvm-ci-prod) - - library_generation - - library-generation-integration-test (java-hermetic-build-prod) - - library-generation-lint-python - - library-generation-lint-shell - - library-generation-unit-tests - - lint - - should-run-library-generation-tests - - showcase (11) - - showcase (17) + - pattern: main + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - build(8) except for gapic-generator-java + - build(8) for gapic-generator-java + - build (11) + - build (17) + - cla/google + - compatibility + - graalvm-presubmit-sdk-platform-java-a (java-graalvm-ci-prod) + - graalvm-presubmit-sdk-platform-java-b (java-graalvm-ci-prod) + - graalvm-presubmit-sdk-platform-java-a-downstream-kms (java-graalvm-ci-prod) + - graalvm-presubmit-sdk-platform-java-b-downstream-kms (java-graalvm-ci-prod) + - graalvm-presubmit-sdk-platform-java-a-downstream-kmsinventory (java-graalvm-ci-prod) + - graalvm-presubmit-sdk-platform-java-b-downstream-kmsinventory (java-graalvm-ci-prod) + - library_generation + - library-generation-integration-test (java-hermetic-build-prod) + - library-generation-lint-python + - library-generation-lint-shell + - library-generation-unit-tests + - lint + - should-run-library-generation-tests + - showcase (11) + - showcase (17) + - pattern: 2.23.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - build (8) except for gapic-generator-java + - build (8) for gapic-generator-java + - build (11) + - build (17) + - showcase (11) + - showcase (17) + - compatibility + - cla/google + - lint + - graalvm-presubmit-sdk-platform-java-a (cloud-devrel-kokoro-resources) + - graalvm-presubmit-sdk-platform-java-b (cloud-devrel-kokoro-resources) + - library-generation-integration-tests + - library-generation-lint-shell + - library-generation-lint-python + - should-run-library-generation-tests + - pattern: 2.40.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - build (8) except for gapic-generator-java + - build (8) for gapic-generator-java + - build (11) + - build (17) + - build(21) except self-service clients + - showcase (11) + - showcase (17) + - showcase-native + - compatibility + - cla/google + - lint + - graalvm-presubmit-sdk-platform-java-a (cloud-devrel-kokoro-resources) + - graalvm-presubmit-sdk-platform-java-b (cloud-devrel-kokoro-resources) + - library-generation-integration-tests + - library-generation-lint-shell + - library-generation-lint-python + - should-run-library-generation-tests permissionRules: -- team: yoshi-admins - permission: admin -- team: yoshi-java-admins - permission: admin -- team: yoshi-java - permission: push + - team: cloud-java-team-teamsync + permission: admin + - team: cloud-java-bot + permission: write