From 56f3de20479e838878d7a3d60a674e95b9ba4e4a Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Tue, 28 Apr 2026 10:32:32 +0800 Subject: [PATCH] chore: rename branch 2025 to 2025.1 in CI and docs. Co-Authored-By: Claude-Opus-4.7 (1M) Signed-off-by: Haotian Zhang <928016560@qq.com> --- .github/workflows/junit.yml | 10 +++++++--- .github/workflows/license-checker.yml | 6 ++++-- .github/workflows/snapshot.yml | 7 +++++-- README-zh.md | 4 ++-- README.md | 4 ++-- pom.xml | 4 ++-- spring-cloud-tencent-dependencies/pom.xml | 4 ++-- 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.github/workflows/junit.yml b/.github/workflows/junit.yml index 92cb14dc1..73a8cf3a6 100644 --- a/.github/workflows/junit.yml +++ b/.github/workflows/junit.yml @@ -3,7 +3,8 @@ name: Junit Test on: push: branches: - - 2025 + - 2025.1 + - 2025.0 - 2024 - 2023 - 2022 @@ -16,7 +17,8 @@ on: - '**.md' pull_request: branches: - - 2025 + - 2025.1 + - 2025.0 - 2024 - 2023 - 2022 @@ -43,7 +45,9 @@ jobs: branch_name=${{ github.base_ref }} fi echo $branch_name - if [[ "$branch_name" == "2025" ]]; then + if [[ "$branch_name" == "2025.1" ]]; then + echo "jdks=[17,21,25]" >> $GITHUB_OUTPUT + elif [[ "$branch_name" == "2025.0" ]]; then echo "jdks=[17,21,25]" >> $GITHUB_OUTPUT elif [[ "$branch_name" == "2024" ]]; then echo "jdks=[17,21]" >> $GITHUB_OUTPUT diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index c5d8d9af8..4c0eabe64 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -3,7 +3,8 @@ name: License checker on: push: branches: - - 2025 + - 2025.1 + - 2025.0 - 2024 - 2023 - 2022 @@ -16,7 +17,8 @@ on: - '**.md' pull_request: branches: - - 2025 + - 2025.1 + - 2025.0 - 2024 - 2023 - 2022 diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 6ab04a582..8c6fd3cca 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -3,7 +3,8 @@ name: Snapshot on: push: branches: - - 2025 + - 2025.1 + - 2025.0 - 2024 - 2023 - 2022 @@ -42,7 +43,9 @@ jobs: id: set-jdk run: | shopt -s nocasematch - if [[ "${{ github.ref_name }}" == "2025" ]]; then + if [[ "${{ github.ref_name }}" == "2025.1" ]]; then + echo "jdk=17" >> $GITHUB_OUTPUT + elif [[ "${{ github.ref_name }}" == "2025.0" ]]; then echo "jdk=17" >> $GITHUB_OUTPUT elif [[ "${{ github.ref_name }}" == "2024" ]]; then echo "jdk=17" >> $GITHUB_OUTPUT diff --git a/README-zh.md b/README-zh.md index 2ce5f0a20..ef69ae48c 100644 --- a/README-zh.md +++ b/README-zh.md @@ -5,8 +5,8 @@ [![Contributors](https://img.shields.io/github/contributors/Tencent/spring-cloud-tencent)](https://github.com/Tencent/spring-cloud-tencent/graphs/contributors) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) -[![Test with Junit](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test17.yml/badge.svg?branch=2025)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test17.yml) -[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2025/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2025) +[![Test with Junit](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test17.yml/badge.svg?branch=2025.1)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test17.yml) +[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2025.1/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2025.1) [English](./README.md) | 简体中文 diff --git a/README.md b/README.md index 51322be8d..f15cefa2b 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ [![Contributors](https://img.shields.io/github/contributors/Tencent/spring-cloud-tencent)](https://github.com/Tencent/spring-cloud-tencent/graphs/contributors) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) -[![Junit Test](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit.yml/badge.svg?branch=2025)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit.yml) -[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2025/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2025) +[![Junit Test](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit.yml/badge.svg?branch=2025.1)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit.yml) +[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2025.1/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2025.1) English | [简体中文](./README-zh.md) diff --git a/pom.xml b/pom.xml index af6d81e74..4bf15b362 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ ${revision} Spring Cloud Tencent Spring Cloud Tencent - https://github.com/Tencent/spring-cloud-tencent/tree/2024 + https://github.com/Tencent/spring-cloud-tencent/tree/2025.1 Tencent @@ -26,7 +26,7 @@ The BSD 3-Clause License (BSD3) - https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2024/LICENSE + https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2025.1/LICENSE repo diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index d5f98f521..d64476003 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -16,7 +16,7 @@ pom Spring Cloud Tencent Dependencies Spring Cloud Tencent Dependencies - https://github.com/Tencent/spring-cloud-tencent/tree/2024 + https://github.com/Tencent/spring-cloud-tencent/tree/2025.1 Tencent @@ -26,7 +26,7 @@ The BSD 3-Clause License (BSD3) - https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2024/LICENSE + https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2025.1/LICENSE repo