Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 43 additions & 22 deletions .github/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,47 @@ 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/graalvm/cloudbuild-test-c.yaml
- .cloudbuild/library_generation/cloudbuild-library-generation-release.yaml
- >-
hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg
- >-
hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg
- >-
hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg
- generation_config.yaml
- WORKSPACE
- .cloudbuild/graalvm/cloudbuild.yaml
- .cloudbuild/graalvm/cloudbuild-test-a.yaml
- .cloudbuild/graalvm/cloudbuild-test-b.yaml
- .cloudbuild/graalvm/cloudbuild-test-c.yaml
- .cloudbuild/library_generation/cloudbuild-library-generation-release.yaml
- >-
hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg
- >-
hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg
- >-
hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg
- generation_config.yaml
branches:
- branch: protobuf-4.x-rc
- branch: 2.23.x
releaseType: java-backport
- branch: 2.40.x
releaseType: java-backport
- branch: 2.54.x
releaseType: java-backport
- branch: 2.59.x
releaseType: java-backport
- branch: protobuf-4.x-rc
- branch: 2.23.x
releaseType: java-backport
- branch: 2.40.x
releaseType: java-backport
- branch: 2.54.x
releaseType: java-backport
- branch: 2.59.x
releaseType: java-backport
- 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/graalvm/cloudbuild-test-c.yaml
- >-
.cloudbuild/library_generation/cloudbuild-library-generation-release.yaml
- >-
hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg
- >-
hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg
- >-
hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg
- generation_config.yaml
branch: 2.66.x
Comment on lines +30 to +50
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The configuration for the 2.66.x branch duplicates several settings from the top-level configuration (handleGHRelease, primaryBranch, manifest, and extraFiles). Branch-specific configurations in release-please inherit from the top-level settings, so this duplication is unnecessary and makes the file harder to maintain.

More critically, specifying primaryBranch: main for a backport branch is incorrect. It will cause release-please to look for commits on main to create a release for the 2.66.x branch, which is not the intended behavior for backports. Removing this key will make release-please correctly track commits on the 2.66.x branch itself.

I suggest removing the redundant keys to simplify the configuration and ensure correct behavior.

  - releaseType: java-backport
    bumpMinorPreMajor: true
    branch: 2.66.x

42 changes: 42 additions & 0 deletions .github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,48 @@ branchProtectionRules:
- showcase (17)
- showcase (21)
- showcase (24)
- pattern: 2.66.x
isAdminEnforced: true
requiredApprovingReviewCount: 1
requiresCodeOwnerReviews: true
requiresStrictStatusChecks: false
requiredStatusCheckContexts:
- build(8) except for gapic-generator-java
- build(8) for gapic-generator-java
Comment on lines +177 to +178
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

There's an inconsistency in the spacing for the build status check names. Other checks in this file, like build (11) and showcase (17), have a space before the parenthesis. The build(8) checks do not. While this might be intentional if the job names are exact, it's more likely a typo that could prevent these required status checks from being correctly enforced. For consistency and to avoid potential issues, I recommend adding a space.

      - 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-c (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-c-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-c-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
Expand Down
Loading