Skip to content

Commit 7429dc0

Browse files
ci: setup for 6.x branch (#3945)
1 parent 3489110 commit 7429dc0

File tree

7 files changed

+78
-9
lines changed

7 files changed

+78
-9
lines changed

.github/dependabot.yml

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ updates:
4545
# Spring Cloud dependencies
4646
# spring-cloud-dependencies-parent should be eventually removed per #1294
4747
- dependency-name: "org.springframework.cloud:spring-cloud-*"
48-
versions: ["2022.x", "2023.x", "2024.x"]
48+
versions: ["2022.x", "2023.x", "2024.x", "2025.x"]
4949
# Spring Shell dependencies
5050
- dependency-name: "org.springframework.shell:spring-shell-starter"
5151
versions: ["3.x"]
@@ -76,7 +76,7 @@ updates:
7676
versions: [">=3.2.0"]
7777
# Spring Cloud dependencies
7878
- dependency-name: "org.springframework.cloud:spring-cloud-*"
79-
versions: ["2023.x", "2024.x"]
79+
versions: ["2023.x", "2024.x", "2025.x"]
8080
# Spring Shell dependencies
8181
- dependency-name: "org.springframework.shell:spring-shell-starter"
8282
versions: [">=3.2.0"]
@@ -110,8 +110,34 @@ updates:
110110
versions: [">=3.4.0"]
111111
# Spring Cloud dependencies
112112
- dependency-name: "org.springframework.cloud:spring-cloud-*"
113-
versions: ["2024.x"]
113+
versions: ["2024.x", "2025.x"]
114114
# Spring Shell dependencies 3.4+ is meant to be used with Spring boot 3.4, which is part of
115115
# the non-supported (by 5.x branch) Spring Cloud 2024
116116
- dependency-name: "org.springframework.shell:spring-shell-starter"
117-
versions: [">=3.4.0"]
117+
versions: [">=3.4.0"]
118+
119+
- package-ecosystem: maven
120+
directory: "/"
121+
schedule:
122+
interval: daily
123+
commit-message:
124+
# Prefix all commit messages with "deps: "
125+
prefix: "deps"
126+
open-pull-requests-limit: 10
127+
target-branch: "6.x"
128+
labels:
129+
- "6.x dependencies"
130+
ignore:
131+
# Ignore major version updates - these should be made manually
132+
- dependency-name: "*"
133+
update-types: [ "version-update:semver-major" ]
134+
# Ignore formatter dependency versions used in codegen modules, since they are fixed for Java 8 support
135+
- dependency-name: "com.coveo:fmt-maven-plugin"
136+
- dependency-name: "com.google.googlejavaformat:google-java-format"
137+
# Ignore dependencies corresponding to Spring Boot 3.5+, <= Spring Cloud 2025.x:
138+
# Spring Boot dependencies
139+
- dependency-name: "org.springframework.boot:spring-boot-*"
140+
versions: [">=3.5.0"]
141+
# Spring Cloud dependencies
142+
- dependency-name: "org.springframework.cloud:spring-cloud-*"
143+
versions: ["2025.x"]

.github/release-please.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ branches:
1818
handleGHRelease: true
1919
branch: 5.x
2020
extraFiles: ["README.adoc"]
21+
- releaseType: java-yoshi
22+
handleGHRelease: true
23+
branch: 6.x
24+
extraFiles: ["README.adoc"]

.github/sync-repo-settings.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,42 @@ branchProtectionRules:
4141
requiredApprovingReviewCount: 1
4242
requiresCodeOwnerReviews: true
4343
requiresStrictStatusChecks: false
44+
- pattern: 6.x
45+
isAdminEnforced: true
46+
requiredStatusCheckContexts:
47+
- 'cla/google'
48+
- 'unitTests (17)'
49+
- 'unitTests (19)'
50+
- 'unitTests (21)'
51+
- 'releaseCheck'
52+
- 'conventionalcommits.org'
53+
- 'Build with Sonar'
54+
- 'parallel-NativeTests (alloydb-sample)'
55+
- 'parallel-NativeTests (bigquery-sample)'
56+
- 'parallel-NativeTests (bigquery)'
57+
- 'parallel-NativeTests (core)'
58+
- 'parallel-NativeTests (data-firestore)'
59+
- 'parallel-NativeTests (data-firestore-sample)'
60+
- 'parallel-NativeTests (datastore)'
61+
- 'parallel-NativeTests (datastore-basic-sample)'
62+
- 'parallel-NativeTests (kms)'
63+
- 'parallel-NativeTests (kms-sample)'
64+
- 'parallel-NativeTests (logging-sample)'
65+
- 'parallel-NativeTests (metrics-sample)'
66+
- 'parallel-NativeTests (pubsub-sample)'
67+
- 'parallel-NativeTests (pubsub-bus-sample)'
68+
- 'parallel-NativeTests (pubsub-integration-sample)'
69+
- 'parallel-NativeTests (secretmanager)'
70+
- 'parallel-NativeTests (secretmanager-sample)'
71+
- 'parallel-NativeTests (spanner)'
72+
- 'parallel-NativeTests (sql-mysql-sample)'
73+
- 'parallel-NativeTests (sql-postgres-sample)'
74+
- 'parallel-NativeTests (starter-firestore-sample)'
75+
- 'parallel-NativeTests (storage)'
76+
- 'parallel-NativeTests (storage-sample)'
77+
- 'parallel-NativeTests (trace-sample)'
78+
- 'parallel-NativeTests (vision)'
79+
- 'parallel-NativeTests (vision-sample)'
4480
- pattern: 5.x
4581
isAdminEnforced: true
4682
requiredStatusCheckContexts:

.github/workflows/NativeTests.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- 6.x
78
- 5.x
89
pull_request:
910
types: [opened, synchronize, reopened]

.github/workflows/integrationTests.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ on:
44
push:
55
branches:
66
- main
7-
- 3.x
8-
- 4.x
7+
- 6.x
98
- 5.x
9+
- 4.x
10+
- 3.x
1011
pull_request:
1112
types: [opened, synchronize, reopened]
1213
paths-ignore:

.github/workflows/renovate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
- name: Run Renovate
1717
uses: renovatebot/forking-renovate@main
1818
with:
19-
baseBranches: main,3.x,4.x,5.x
19+
baseBranches: main,6.x,5.x,4.x,3.x
2020
createPullRequests: true

.github/workflows/unitTests.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ on:
44
push:
55
branches:
66
- main
7-
- 3.x
8-
- 4.x
7+
- 6.x
98
- 5.x
9+
- 4.x
10+
- 3.x
1011
pull_request:
1112
workflow_dispatch:
1213
schedule:

0 commit comments

Comments
 (0)