Skip to content

Commit a9bdde6

Browse files
authored
chore: fix readme and ci workflow branch name (#4089)
1 parent d9d9be6 commit a9bdde6

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

.github/workflows/integration-test.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ on:
33
push:
44
branches:
55
- 2023.x
6-
- 2025.x
6+
- 2025.0.x
7+
- 2025.1.x
78
pull_request:
89
branches:
910
- 2023.x
10-
- 2025.x
11+
- 2025.0.x
12+
- 2025.1.x
1113
jobs:
1214
deploy-docker-image:
1315
runs-on: ubuntu-latest

.github/workflows/md-link-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- '**/*.md'
1313
- '**/link-check.yml'
1414
pull_request:
15-
branches: [2023.x, 2025.x, "release/**"]
15+
branches: [2023.x, 2025.0.x, 2025.1.x, "release/**"]
1616
paths:
1717
- '**/*.md'
1818
- '**/link-check.yml'

README-zh.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ Spring Cloud Alibaba 致力于提供微服务开发的一站式解决方案。
5151
更多组件请参考 [Roadmap](https://github.com/alibaba/spring-cloud-alibaba/blob/2023.x/Roadmap-zh.md)
5252

5353
## 如何构建
54-
* 2025.x 分支对应的是 Spring Cloud 2025 与 Spring Boot 3.5.x,最低支持 JDK 17。
54+
* 2025.1.x 分支对应的是 Spring Cloud 2025.1.x 与 Spring Boot 4.0.x,最低支持 JDK 17。
55+
* 2025.0.x 分支对应的是 Spring Cloud 2025.0.x 与 Spring Boot 3.5.x,最低支持 JDK 17。
5556
* 2023.x 分支对应的是 Spring Cloud 2023 与 Spring Boot 3.2.x,最低支持 JDK 17。
5657
* 2022.x 分支对应的是 Spring Cloud 2022 与 Spring Boot 3.0.x,最低支持 JDK 17。
5758
* 2021.x 分支对应的是 Spring Cloud 2021 与 Spring Boot 2.6.x,最低支持 JDK 1.8。
@@ -121,7 +122,8 @@ Example 列表:
121122
* 2021.x 版本适用于 Spring Boot 2.6.x
122123
* 2022.x 版本适用于 Spring Boot 3.0.x
123124
* 2023.x 版本适用于 Spring Boot 3.2.x
124-
* 2025.x 版本适用于 Spring Boot 3.5.x
125+
* 2025.0.x 版本适用于 Spring Boot 3.5.x
126+
* 2025.1.x 版本适用于 Spring Boot 4.0.x
125127

126128
## 社区交流
127129

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ In addition to the above-mentioned features, for the needs of enterprise users'
5050
For more features please refer to [Roadmap](https://github.com/alibaba/spring-cloud-alibaba/blob/2023.x/Roadmap.md).
5151

5252
## How to build
53-
* **2025.x branch**: Corresponds to Spring Cloud 2025 & Spring Boot 3.5.x, JDK 17 or later versions are supported.
53+
* **2025.1.x branch**: Corresponds to Spring Cloud 2025.1.x & Spring Boot 4.0.x, JDK 17 or later versions are supported.
54+
* **2025.0.x branch**: Corresponds to Spring Cloud 2025.0.x & Spring Boot 3.5.x, JDK 17 or later versions are supported.
5455
* **2023.x branch**: Corresponds to Spring Cloud 2023 & Spring Boot 3.2.x, JDK 17 or later versions are supported.
5556
* **2022.x branch**: Corresponds to Spring Cloud 2022 & Spring Boot 3.0.x, JDK 17 or later versions are supported.
5657
* **2021.x branch**: Corresponds to Spring Cloud 2021 & Spring Boot 2.6.x. JDK 1.8 or later versions are supported.
@@ -112,7 +113,8 @@ As the interfaces and annotations of Spring Boot 1 and Spring Boot 2 have been c
112113
* 2021.x for Spring Boot 2.6.x
113114
* 2022.x for Spring Boot 3.0.x
114115
* 2023.x for Spring Boot 3.2.x
115-
* 2025.x for Spring Boot 3.5.x
116+
* 2025.0.x for Spring Boot 3.5.x
117+
* 2025.1.x for Spring Boot 4.0.x
116118

117119
## Code of Conduct
118120
This project is a sub-project of Spring Cloud, it adheres to the Contributor Covenant [code of conduct](https://sca.aliyun.com/en-us/community/developer/contributor-guide/new-contributor-guide_dev/). By participating, you are expected to uphold this code. Please report unacceptable behavior to [email protected].

0 commit comments

Comments
 (0)