Skip to content
This repository was archived by the owner on Feb 24, 2026. It is now read-only.

Commit 46f690d

Browse files
authored
Merge branch 'main' into renovate/com.google.cloud-sdk-platform-java-config-3.x
2 parents 46cc553 + 4096a53 commit 46f690d

File tree

2 files changed

+39
-19
lines changed

2 files changed

+39
-19
lines changed

.github/release-please.yml

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,26 @@ bumpMinorPreMajor: true
22
handleGHRelease: true
33
releaseType: java-yoshi
44
branches:
5-
- branch: java7
6-
- branch: 2.4.x
7-
releaseType: java-backport
8-
- branch: 2.12.x
9-
releaseType: java-backport
10-
- branch: 2.25.x
11-
releaseType: java-backport
12-
- branch: 2.38.x
13-
releaseType: java-backport
14-
- branch: 2.47.x
15-
releaseType: java-backport
16-
- branch: 3.5.x
17-
releaseType: java-backport
18-
- branch: 3.11.x
19-
releaseType: java-backport
20-
- branch: 3.15.x
21-
releaseType: java-backport
22-
- branch: protobuf-4.x-rc
23-
manifest: true
5+
- branch: java7
6+
- branch: 2.4.x
7+
releaseType: java-backport
8+
- branch: 2.12.x
9+
releaseType: java-backport
10+
- branch: 2.25.x
11+
releaseType: java-backport
12+
- branch: 2.38.x
13+
releaseType: java-backport
14+
- branch: 2.47.x
15+
releaseType: java-backport
16+
- branch: 3.5.x
17+
releaseType: java-backport
18+
- branch: 3.11.x
19+
releaseType: java-backport
20+
- branch: 3.15.x
21+
releaseType: java-backport
22+
- branch: protobuf-4.x-rc
23+
manifest: true
24+
- bumpMinorPreMajor: true
25+
handleGHRelease: true
26+
releaseType: java-backport
27+
branch: 3.20.x

.github/sync-repo-settings.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,22 @@ branchProtectionRules:
148148
- javadoc
149149
- library_generation
150150
- unmanaged_dependency_check
151+
- pattern: 3.20.x
152+
isAdminEnforced: true
153+
requiredApprovingReviewCount: 1
154+
requiresCodeOwnerReviews: true
155+
requiresStrictStatusChecks: false
156+
requiredStatusCheckContexts:
157+
- dependencies (17)
158+
- lint
159+
- clirr
160+
- units (8)
161+
- units (11)
162+
- 'Kokoro - Test: Integration'
163+
- cla/google
164+
- javadoc
165+
- library_generation
166+
- unmanaged_dependency_check
151167
permissionRules:
152168
- team: yoshi-admins
153169
permission: admin

0 commit comments

Comments
 (0)