From 720919f0396f400479c55e6324883f7bdf58f3b1 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 16:18:29 +0000 Subject: [PATCH 1/4] feat: next release from main branch is 2.55.0 --- .github/release-please.yml | 22 +++++++++++++- .github/sync-repo-settings.yaml | 51 ++++++++++++++++++++++++++++++--- 2 files changed, 68 insertions(+), 5 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index e42bd9d1a5..a59c5e3025 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -3,7 +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", ".cloudbuild/library_generation/cloudbuild-library-generation-release.yaml", "generation_config.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 @@ -13,3 +19,17 @@ branches: releaseType: java-backport manifest: true handleGHRelease: true + - releaseType: java-backport + 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 + - >- + .cloudbuild/library_generation/cloudbuild-library-generation-release.yaml + - generation_config.yaml + branch: 2.54.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 4e71b4eabc..0994d4d1e5 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -16,10 +16,18 @@ branchProtectionRules: - 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) + - >- + 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 @@ -73,6 +81,41 @@ branchProtectionRules: - library-generation-lint-shell - library-generation-lint-python - should-run-library-generation-tests + - pattern: 2.54.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) + - 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) permissionRules: - team: cloud-java-team-teamsync permission: admin From 8c3d1c795ee2ccd4d114a4b3c4af1a7b3419997f Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 11:22:34 -0500 Subject: [PATCH 2/4] removed added primary-branch tag release-please.yml --- .github/release-please.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index a59c5e3025..70b9d46f4e 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -22,7 +22,6 @@ branches: - releaseType: java-backport bumpMinorPreMajor: true handleGHRelease: true - primaryBranch: main manifest: true extraFiles: - WORKSPACE From 3a187bebf0d1e820ad17889c58b7ec22b33eff2e Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 12:37:38 -0500 Subject: [PATCH 3/4] removed duplication extra files in release-please.yml --- .github/release-please.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 70b9d46f4e..8b3374194b 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -23,12 +23,4 @@ branches: bumpMinorPreMajor: true handleGHRelease: true manifest: true - 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 branch: 2.54.x From 0a5df2aa0a9e70e813923b297c3f99b0b1f0512f Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 12:39:02 -0500 Subject: [PATCH 4/4] added back showcase native tests to LTS 8 branch --- .github/sync-repo-settings.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 0994d4d1e5..90b3120fdc 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -114,6 +114,7 @@ branchProtectionRules: - library-generation-unit-tests - lint - should-run-library-generation-tests + - showcase-native - showcase (11) - showcase (17) permissionRules: