Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: setup for 5.x branch #3436

Merged
merged 15 commits into from
Jan 25, 2025
Merged
34 changes: 32 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ updates:
# Spring Cloud dependencies
# spring-cloud-dependencies-parent should be eventually removed per #1294
- dependency-name: "org.springframework.cloud:spring-cloud-*"
versions: ["2022.x", "2023.x", "4.x"]
versions: ["2022.x", "2023.x", "2024.x", "4.x"]
zhumin8 marked this conversation as resolved.
Show resolved Hide resolved
# Spring Shell dependencies
- dependency-name: "org.springframework.shell:spring-shell-starter"
versions: ["3.x"]
Expand Down Expand Up @@ -76,7 +76,37 @@ updates:
versions: [">=3.2.0"]
# Spring Cloud dependencies
- dependency-name: "org.springframework.cloud:spring-cloud-*"
versions: ["2023.x"]
versions: ["2023.x", "2024.x"]
# Spring Shell dependencies
- dependency-name: "org.springframework.shell:spring-shell-starter"
versions: [">=3.2.0"]

- package-ecosystem: maven
directory: "/"
schedule:
interval: daily
commit-message:
# Prefix all commit messages with "deps: "
prefix: "deps"
open-pull-requests-limit: 10
target-branch: "5.x"
labels:
- "5.x dependencies"
ignore:
# Ignore major version updates - these should be made manually
- dependency-name: "*"
update-types: [ "version-update:semver-major" ]
# Ignore formatter dependency versions used in codegen modules, since they are fixed for Java 8 support
- dependency-name: "com.coveo:fmt-maven-plugin"
- dependency-name: "com.google.googlejavaformat:google-java-format"
# Ignore dependencies corresponding to Spring Boot 3.4+, Spring Cloud 2024.x:
# Spring Boot dependencies
- dependency-name: "org.springframework.boot:spring-boot-*"
versions: [">=3.4.0"]
# Spring Cloud dependencies
- dependency-name: "org.springframework.cloud:spring-cloud-*"
versions: ["2024.x"]
# Spring Shell dependencies 3.4+ is meant to be used with Spring boot 3.4, which is part of
# the non-supported (by 5.x branch) Spring Cloud 2024
- dependency-name: "org.springframework.shell:spring-shell-starter"
versions: [">=3.4.0"]
4 changes: 4 additions & 0 deletions .github/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ branches:
handleGHRelease: true
branch: 4.x
extraFiles: ["README.adoc"]
- releaseType: java-yoshi
handleGHRelease: true
branch: 5.x
extraFiles: ["README.adoc"]
1 change: 1 addition & 0 deletions .github/workflows/integrationTests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- main
- 3.x
- 4.x
- 5.x
Copy link
Contributor

Choose a reason for hiding this comment

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

we may need to also add 5.x to .github/workflows/NativeTests.yaml

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

pull_request:
types: [opened, synchronize, reopened]
paths-ignore:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renovate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
- name: Run Renovate
uses: renovatebot/forking-renovate@main
with:
baseBranches: main,3.x,4.x
baseBranches: main,3.x,4.x,5.x
createPullRequests: true
1 change: 1 addition & 0 deletions .github/workflows/sonar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- main
- 5.x # 5.x supports JDK 17
zhumin8 marked this conversation as resolved.
Show resolved Hide resolved
pull_request:
types: [opened, synchronize, reopened]
workflow_dispatch:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/unitTests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- main
- 3.x
- 4.x
- 5.x
pull_request:
workflow_dispatch:
schedule:
Expand Down
Loading