Skip to content

Commit b404431

Browse files
authored
chore: setup declarative configuration for branch protection and release-please (#3091)
fixes #3085 This change should migrate all required tests from "settings" tab to `.github/sync-repo-settings.yaml`. Also setting up release-please branches for lts. Sync-repo-settings.yaml is updated referencing [this guide](https://github.com/googleapis/repo-automation-bots/tree/main/packages/sync-repo-settings), and settings in google-cloud-java [here](https://github.com/googleapis/google-cloud-java/blob/main/.github/sync-repo-settings.yaml). Release-please.yaml is updated referencing [this](https://github.com/googleapis/repo-automation-bots/tree/main/packages/release-please#configuration) and google-cloud-java settings [here](https://github.com/googleapis/google-cloud-java/blob/main/.github/release-please.yml). **Questions to reviewers:** - Is permission rules with "yoshi-" teams still accurate? Do we prefer java specific teams as admin/push? - This update will override configurations in “Settings” for protected branches, I do not have access to this tab. Can you please double check I am not missing anything AND/OR give me access to it?
1 parent 1c6ebae commit b404431

File tree

2 files changed

+85
-34
lines changed

2 files changed

+85
-34
lines changed

.github/release-please.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,13 @@ bumpMinorPreMajor: true
33
handleGHRelease: true
44
primaryBranch: main
55
manifest: true
6-
extraFiles: ["WORKSPACE", ".cloudbuild/graalvm/cloudbuild.yaml", ".cloudbuild/graalvm/cloudbuild-test-a.yaml", ".cloudbuild/graalvm/cloudbuild-test-b.yaml"]
6+
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"]
7+
branches:
8+
- branch: 2.23.x
9+
releaseType: java-backport
10+
manifest: true
11+
handleGHRelease: true
12+
- branch: 2.40.x
13+
releaseType: java-backport
14+
manifest: true
15+
handleGHRelease: true

.github/sync-repo-settings.yaml

Lines changed: 75 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,79 @@ rebaseMergeAllowed: true
22
squashMergeAllowed: true
33
mergeCommitAllowed: false
44
branchProtectionRules:
5-
- pattern: main
6-
isAdminEnforced: true
7-
requiredApprovingReviewCount: 1
8-
requiresCodeOwnerReviews: true
9-
requiresStrictStatusChecks: false
10-
requiredStatusCheckContexts:
11-
- build(8) except for gapic-generator-java
12-
- build(8) for gapic-generator-java
13-
- build (11)
14-
- build (17)
15-
- cla/google
16-
- compatibility
17-
- graalvm-presubmit-sdk-platform-java-a (java-graalvm-ci-prod)
18-
- graalvm-presubmit-sdk-platform-java-b (java-graalvm-ci-prod)
19-
- graalvm-presubmit-sdk-platform-java-a-downstream-kms (java-graalvm-ci-prod)
20-
- graalvm-presubmit-sdk-platform-java-b-downstream-kms (java-graalvm-ci-prod)
21-
- graalvm-presubmit-sdk-platform-java-a-downstream-kmsinventory (java-graalvm-ci-prod)
22-
- graalvm-presubmit-sdk-platform-java-b-downstream-kmsinventory (java-graalvm-ci-prod)
23-
- library_generation
24-
- library-generation-integration-test (java-hermetic-build-prod)
25-
- library-generation-lint-python
26-
- library-generation-lint-shell
27-
- library-generation-unit-tests
28-
- lint
29-
- should-run-library-generation-tests
30-
- showcase (11)
31-
- showcase (17)
5+
- pattern: main
6+
isAdminEnforced: true
7+
requiredApprovingReviewCount: 1
8+
requiresCodeOwnerReviews: true
9+
requiresStrictStatusChecks: false
10+
requiredStatusCheckContexts:
11+
- build(8) except for gapic-generator-java
12+
- build(8) for gapic-generator-java
13+
- build (11)
14+
- build (17)
15+
- cla/google
16+
- compatibility
17+
- graalvm-presubmit-sdk-platform-java-a (java-graalvm-ci-prod)
18+
- graalvm-presubmit-sdk-platform-java-b (java-graalvm-ci-prod)
19+
- graalvm-presubmit-sdk-platform-java-a-downstream-kms (java-graalvm-ci-prod)
20+
- graalvm-presubmit-sdk-platform-java-b-downstream-kms (java-graalvm-ci-prod)
21+
- graalvm-presubmit-sdk-platform-java-a-downstream-kmsinventory (java-graalvm-ci-prod)
22+
- graalvm-presubmit-sdk-platform-java-b-downstream-kmsinventory (java-graalvm-ci-prod)
23+
- library_generation
24+
- library-generation-integration-test (java-hermetic-build-prod)
25+
- library-generation-lint-python
26+
- library-generation-lint-shell
27+
- library-generation-unit-tests
28+
- lint
29+
- should-run-library-generation-tests
30+
- showcase (11)
31+
- showcase (17)
32+
- pattern: 2.23.x
33+
isAdminEnforced: true
34+
requiredApprovingReviewCount: 1
35+
requiresCodeOwnerReviews: true
36+
requiresStrictStatusChecks: false
37+
requiredStatusCheckContexts:
38+
- build (8) except for gapic-generator-java
39+
- build (8) for gapic-generator-java
40+
- build (11)
41+
- build (17)
42+
- showcase (11)
43+
- showcase (17)
44+
- compatibility
45+
- cla/google
46+
- lint
47+
- graalvm-presubmit-sdk-platform-java-a (cloud-devrel-kokoro-resources)
48+
- graalvm-presubmit-sdk-platform-java-b (cloud-devrel-kokoro-resources)
49+
- library-generation-integration-tests
50+
- library-generation-lint-shell
51+
- library-generation-lint-python
52+
- should-run-library-generation-tests
53+
- pattern: 2.40.x
54+
isAdminEnforced: true
55+
requiredApprovingReviewCount: 1
56+
requiresCodeOwnerReviews: true
57+
requiresStrictStatusChecks: false
58+
requiredStatusCheckContexts:
59+
- build (8) except for gapic-generator-java
60+
- build (8) for gapic-generator-java
61+
- build (11)
62+
- build (17)
63+
- build(21) except self-service clients
64+
- showcase (11)
65+
- showcase (17)
66+
- showcase-native
67+
- compatibility
68+
- cla/google
69+
- lint
70+
- graalvm-presubmit-sdk-platform-java-a (cloud-devrel-kokoro-resources)
71+
- graalvm-presubmit-sdk-platform-java-b (cloud-devrel-kokoro-resources)
72+
- library-generation-integration-tests
73+
- library-generation-lint-shell
74+
- library-generation-lint-python
75+
- should-run-library-generation-tests
3276
permissionRules:
33-
- team: yoshi-admins
34-
permission: admin
35-
- team: yoshi-java-admins
36-
permission: admin
37-
- team: yoshi-java
38-
permission: push
77+
- team: cloud-java-team-teamsync
78+
permission: admin
79+
- team: cloud-java-bot
80+
permission: write

0 commit comments

Comments
 (0)