From c3b7e3894b9363b306b45083ba9b524daa88d471 Mon Sep 17 00:00:00 2001 From: Jerry Lee Date: Sun, 3 Dec 2023 14:01:56 +0800 Subject: [PATCH 1/2] chore/docs: update CI configs; upgrade TTL version in example - update github actions - actions/setup-java - actions/checkout - remove CI jdk 20 - remove stale `appveyor` files --- .github/dependabot.yml | 14 +++++--- .github/workflows/ci.yaml | 8 ++--- .github/workflows/strong_ci.yaml | 18 ++++------ CONTRIBUTING.md | 5 +-- README-EN.md | 18 +++++----- README.md | 18 +++++----- docs/release-action-list.md | 2 +- pom.xml | 4 +-- scripts/clear-appveyor-cache.ps1 | 36 ------------------- scripts/integration-test.sh | 1 - ttl-agent/pom.xml | 4 +-- ttl-bom/pom.xml | 4 +-- ttl-core/pom.xml | 4 +-- .../vertx3-ttl-integration/pom.xml | 4 +-- .../vertx4-ttl-integration/pom.xml | 4 +-- ttl-kotlin/pom.xml | 4 +-- ttl2-compatible/pom.xml | 4 +-- 17 files changed, 55 insertions(+), 97 deletions(-) delete mode 100755 scripts/clear-appveyor-cache.ps1 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 61cfe694e..158c133e9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,11 @@ version: 2 updates: -- package-ecosystem: maven - directory: / - schedule: - interval: daily - open-pull-requests-limit: 10 + - package-ecosystem: maven + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 20 + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b910d669e..75c2c6d80 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,14 +10,14 @@ jobs: strategy: matrix: os: [ ubuntu-latest, windows-latest ] - java: [ 8, 11, 17, 20, 21 ] + java: [ 8, 11, 17, 21 ] fail-fast: false max-parallel: 64 - name: Fast Test on Java ${{ matrix.java }} OS ${{ matrix.os }} + name: Fast CI on Java ${{ matrix.java }} OS ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: zulu diff --git a/.github/workflows/strong_ci.yaml b/.github/workflows/strong_ci.yaml index 2c01bbdc6..c9940e3d4 100644 --- a/.github/workflows/strong_ci.yaml +++ b/.github/workflows/strong_ci.yaml @@ -8,37 +8,32 @@ jobs: # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#choosing-github-hosted-runners runs-on: ubuntu-latest timeout-minutes: 30 - name: Strong Test by multiply java versions + name: Strong CI by multiply java versions steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - name: setup Java 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 8 distribution: zulu # only first java setup need enable cache cache: maven - name: setup Java 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 11 distribution: microsoft - name: setup Java 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: microsoft - - name: setup Java 20 - uses: actions/setup-java@v3 - with: - java-version: 20 - distribution: zulu - name: setup Java 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 21 distribution: zulu @@ -49,7 +44,6 @@ jobs: JAVA8_HOME: ${{ env.JAVA_HOME_8_X64 }} JAVA11_HOME: ${{ env.JAVA_HOME_11_X64 }} JAVA17_HOME: ${{ env.JAVA_HOME_17_X64 }} - JAVA20_HOME: ${{ env.JAVA_HOME_20_X64 }} JAVA21_HOME: ${{ env.JAVA_HOME_21_X64 }} - name: remove self maven install files diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7cba10c33..24fcbe6ca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -210,10 +210,7 @@ disclosure! ## Continuous integration -TransmittableThreadLocal(TTL) currently uses a combination of Travis and Appveyor for Continuous Integration: - -* Travis [runs all tests for each commit and PR on wide range JDK](https://travis-ci.org/alibaba/transmittable-thread-local) -* Appveyor [runs the tests for each commit and PR on windows](https://ci.appveyor.com/project/oldratlee/transmittable-thread-local) +TransmittableThreadLocal(TTL) uses GitHub actions for Continuous Integration: https://github.com/alibaba/transmittable-thread-local/actions ## Related links diff --git a/README-EN.md b/README-EN.md index ecd896ed4..65c4a5ed7 100644 --- a/README-EN.md +++ b/README-EN.md @@ -8,13 +8,13 @@ ----------------------------------------

-Github Workflow Build Status -Github Workflow Build Status -Coverage Status -JDK support +Fast CI +Strong CI +Coverage Status +JDK support License -Javadocs -Maven Central +Javadocs +Maven Central GitHub release GitHub Stars GitHub Forks @@ -22,7 +22,7 @@ GitHub issues GitHub Contributors GitHub repo size -gitpod: Ready to Code +gitpod: Ready to Code

📖 English Documentation | [📖 中文文档](README.md) @@ -313,7 +313,7 @@ The current version Java API documentation: com.alibaba transmittable-thread-local - 2.14.2 + 2.14.4 ``` @@ -424,7 +424,7 @@ Some open-source projects used `TTL`: 电商商城 java电商商城系统 uniapp商城 多用户商城 - [`Joolun/JooLun-wx` ![](https://img.shields.io/github/stars/Joolun/JooLun-wx.svg?style=social&label=Star)](https://github.com/Joolun/JooLun-wx) [![star](https://gitee.com/joolun/JooLun-wx/badge/star.svg?theme=gray)](https://gitee.com/joolun/JooLun-wx) JooLun微信商城 - - [`HummerRisk/HummerRisk` ![](https://img.shields.io/github/stars/HummerRisk/HummerRisk.svg?style=social&label=Star)](https://github.com/HummerRisk/HummerRisk) [![star](https://gitee.com/hummercloud/HummerRisk/badge/star.svg?theme=gray)](https://gitee.com/hummercloud/HummerRisk) + - [`HummerRisk/HummerRisk` ![](https://img.shields.io/github/stars/HummerRisk/HummerRisk.svg?style=social&label=Star)](https://github.com/HummerRisk/HummerRisk) 云原生安全平台，包括混合云安全治理和容器云安全检测 - [`XiaoMi/mone` ![](https://img.shields.io/github/stars/XiaoMi/mone.svg?style=social&label=Star)](https://github.com/XiaoMi/mone) `Mone`以微服务为核心的一站式企业协同研发平台。支持公共云、专有云和混合云多种部署形态；提供从“项目创建->开发->部署->治理->应用观测”端到端的研发全流程服务；通过云原生新技术和研发新模式，打造“双敏”，敏捷研发和敏捷组织，保障小米-中国区高复杂业务、大规模团队的敏捷研发协同，实现多倍效能提升。 diff --git a/README.md b/README.md index 019e90998..d001eaac6 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@ ----------------------------------------

-Github Workflow Build Status -Github Workflow Build Status -Coverage Status -JDK support +Fast CI +Strong CI +Coverage Status +JDK support License -Javadocs -Maven Central +Javadocs +Maven Central GitHub release GitHub Stars GitHub Forks @@ -22,7 +22,7 @@ GitHub issues GitHub Contributors GitHub repo size -gitpod: Ready to Code +gitpod: Ready to Code

[📖 English Documentation](README-EN.md) | 📖 中文文档 @@ -385,7 +385,7 @@ These paths are searched by the bootstrap class loader after the platform specif com.alibaba transmittable-thread-local - 2.14.2 + 2.14.4 ``` @@ -572,7 +572,7 @@ JDK Bug: 电商商城 java电商商城系统 uniapp商城 多用户商城 - [`Joolun/JooLun-wx` ![](https://img.shields.io/github/stars/Joolun/JooLun-wx.svg?style=social&label=Star)](https://github.com/Joolun/JooLun-wx) [![star](https://gitee.com/joolun/JooLun-wx/badge/star.svg?theme=gray)](https://gitee.com/joolun/JooLun-wx) JooLun微信商城 - - [`HummerRisk/HummerRisk` ![](https://img.shields.io/github/stars/HummerRisk/HummerRisk.svg?style=social&label=Star)](https://github.com/HummerRisk/HummerRisk) [![star](https://gitee.com/hummercloud/HummerRisk/badge/star.svg?theme=gray)](https://gitee.com/hummercloud/HummerRisk) + - [`HummerRisk/HummerRisk` ![](https://img.shields.io/github/stars/HummerRisk/HummerRisk.svg?style=social&label=Star)](https://github.com/HummerRisk/HummerRisk) 云原生安全平台，包括混合云安全治理和容器云安全检测 - [`XiaoMi/mone` ![](https://img.shields.io/github/stars/XiaoMi/mone.svg?style=social&label=Star)](https://github.com/XiaoMi/mone) `Mone`以微服务为核心的一站式企业协同研发平台。支持公共云、专有云和混合云多种部署形态；提供从“项目创建->开发->部署->治理->应用观测”端到端的研发全流程服务；通过云原生新技术和研发新模式，打造“双敏”，敏捷研发和敏捷组织，保障小米-中国区高复杂业务、大规模团队的敏捷研发协同，实现多倍效能提升。 diff --git a/docs/release-action-list.md b/docs/release-action-list.md index 5bd350c18..a2c896cd6 100644 --- a/docs/release-action-list.md +++ b/docs/release-action-list.md @@ -16,7 +16,7 @@ 2. 新建并Push Tag，如`v2.x.y` - `git tag -m 'release v2.x.y' v2.x.y` - `git push origin v2.x.y` -3. 等待Tag的CI通过 https://ci.appveyor.com/project/oldratlee/transmittable-thread-local/history +3. 等待Tag的CI通过 https://github.com/alibaba/transmittable-thread-local/actions 4. 执行[`scripts/check-japi-compliance.sh`](../scripts/check-japi-compliance.sh)，检查`API`兼容性 5. 发布版本到`Maven`中央库 `./mvnw clean && ./mvnw deploy -DperformRelease` diff --git a/pom.xml b/pom.xml index aeb3c03cc..504aefd6d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,8 +32,8 @@ GitHub Issues - AppVeyor - https://ci.appveyor.com/project/oldratlee/transmittable-thread-local + GitHub Actions + https://github.com/alibaba/transmittable-thread-local/actions Alibaba diff --git a/scripts/clear-appveyor-cache.ps1 b/scripts/clear-appveyor-cache.ps1 deleted file mode 100755 index 9083ac3b0..000000000 --- a/scripts/clear-appveyor-cache.ps1 +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env pwsh - -$appveyor_project = "oldratlee/transmittable-thread-local" - -# https://stackoverflow.com/questions/24649019/how-to-use-confirm-in-powershell -$confirmation = Read-Host "Are you Sure You Want To Clear cache of appveyor project $appveyor_project [y/N]" -if ($confirmation -ne 'y') -{ - Write-Output "do nothing and exit" - exit -} - -# PowerShell: Run command from script's directory - Stack Overflow -# https://stackoverflow.com/questions/4724290 -# $script_path = $MyInvocation.MyCommand.Path -# $script_dir = Split-Path $script_path - -# Equivalent of bash's `source` command in Powershell? - Super User -# https://superuser.com/questions/71446 -# Script scope and dot sourcing - PowerShell | Microsoft Docs -# https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_scripts#script-scope-and-dot-sourcing -# PowerShell: How to quickly switch to your home directory -# https://sid-500.com/2017/08/03/powershell-how-to-quickly-switch-to-your-home-directory/ -. "$home\.appveyor_token.ps1" -# file appveyor_token.ps1 provide appveyor token. content sample: -# $appveyor_token = xxx - -# https://www.appveyor.com/docs/build-cache/#remove-cache-entry-from-build-config -# https://www.appveyor.com/docs/api/#authentication - -$headers = @{ } -$headers['Authorization'] = "Bearer $appveyor_token" -$headers["Content-type"] = "application/json" -$uri = "https://ci.appveyor.com/api/projects/$appveyor_project/buildcache" - -Invoke-RestMethod -Uri $uri -Headers $headers -Method Delete diff --git a/scripts/integration-test.sh b/scripts/integration-test.sh index 72b935779..8e8a3e39d 100755 --- a/scripts/integration-test.sh +++ b/scripts/integration-test.sh @@ -19,7 +19,6 @@ readonly JDK_VERSIONS=( 8 "$default_build_jdk_version" 17 - 20 21 ) diff --git a/ttl-agent/pom.xml b/ttl-agent/pom.xml index f5d11e51d..b0373cfa9 100644 --- a/ttl-agent/pom.xml +++ b/ttl-agent/pom.xml @@ -33,8 +33,8 @@ GitHub Issues - AppVeyor - https://ci.appveyor.com/project/oldratlee/transmittable-thread-local + GitHub Actions + https://github.com/alibaba/transmittable-thread-local/actions Alibaba diff --git a/ttl-bom/pom.xml b/ttl-bom/pom.xml index af0b63d4a..d3bccfd2f 100644 --- a/ttl-bom/pom.xml +++ b/ttl-bom/pom.xml @@ -32,8 +32,8 @@ GitHub Issues - AppVeyor - https://ci.appveyor.com/project/oldratlee/transmittable-thread-local + GitHub Actions + https://github.com/alibaba/transmittable-thread-local/actions Alibaba diff --git a/ttl-core/pom.xml b/ttl-core/pom.xml index f8c32c419..70acf1c26 100644 --- a/ttl-core/pom.xml +++ b/ttl-core/pom.xml @@ -36,8 +36,8 @@ GitHub Issues - AppVeyor - https://ci.appveyor.com/project/oldratlee/transmittable-thread-local + GitHub Actions + https://github.com/alibaba/transmittable-thread-local/actions Alibaba diff --git a/ttl-integrations/vertx3-ttl-integration/pom.xml b/ttl-integrations/vertx3-ttl-integration/pom.xml index cff33b773..0a05cb065 100644 --- a/ttl-integrations/vertx3-ttl-integration/pom.xml +++ b/ttl-integrations/vertx3-ttl-integration/pom.xml @@ -34,8 +34,8 @@ GitHub Issues - AppVeyor - https://ci.appveyor.com/project/oldratlee/transmittable-thread-local + GitHub Actions + https://github.com/alibaba/transmittable-thread-local/actions diff --git a/ttl-integrations/vertx4-ttl-integration/pom.xml b/ttl-integrations/vertx4-ttl-integration/pom.xml index bc6fa4f1a..6d17b4e9d 100644 --- a/ttl-integrations/vertx4-ttl-integration/pom.xml +++ b/ttl-integrations/vertx4-ttl-integration/pom.xml @@ -34,8 +34,8 @@ GitHub Issues - AppVeyor - https://ci.appveyor.com/project/oldratlee/transmittable-thread-local + GitHub Actions + https://github.com/alibaba/transmittable-thread-local/actions diff --git a/ttl-kotlin/pom.xml b/ttl-kotlin/pom.xml index 6660bb4a8..947cbed3f 100644 --- a/ttl-kotlin/pom.xml +++ b/ttl-kotlin/pom.xml @@ -33,8 +33,8 @@ GitHub Issues - AppVeyor - https://ci.appveyor.com/project/oldratlee/transmittable-thread-local + GitHub Actions + https://github.com/alibaba/transmittable-thread-local/actions Alibaba diff --git a/ttl2-compatible/pom.xml b/ttl2-compatible/pom.xml index 78de57a61..2caaab682 100644 --- a/ttl2-compatible/pom.xml +++ b/ttl2-compatible/pom.xml @@ -37,8 +37,8 @@ GitHub Issues - AppVeyor - https://ci.appveyor.com/project/oldratlee/transmittable-thread-local + GitHub Actions + https://github.com/alibaba/transmittable-thread-local/actions Alibaba From 4592afcf2e3935f25032e9053da16b7e281d3aab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 3 Dec 2023 07:22:46 +0000 Subject: [PATCH 2/2] chore(deps): bump com.github.spotbugs:spotbugs-maven-plugin Bumps [com.github.spotbugs:spotbugs-maven-plugin](https://github.com/spotbugs/spotbugs-maven-plugin) from 4.8.1.0 to 4.8.2.0. - [Release notes](https://github.com/spotbugs/spotbugs-maven-plugin/releases) - [Commits](https://github.com/spotbugs/spotbugs-maven-plugin/compare/spotbugs-maven-plugin-4.8.1.0...spotbugs-maven-plugin-4.8.2.0) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 504aefd6d..cdfee1b62 100644 --- a/pom.xml +++ b/pom.xml @@ -517,7 +517,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.1.0 + 4.8.2.0 org.jacoco