From c004aa516151b12c6bab3f9bf2e2daf16c45c64b Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Fri, 19 May 2023 19:28:00 +0800 Subject: [PATCH] docs:add release GitHub Action. (#1007) --- .github/workflows/release.yml | 27 +++++++++++++++++++ CHANGELOG.md | 1 + .../tsf/adapter/config/TsfDiscoveryFlow.java | 5 ++++ .../context/PolarisSDKContextManager.java | 6 +++-- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..49f492d0 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,27 @@ +name: Release + +on: + release: + types: [ published ] + +jobs: + release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + server-id: nexus-releases + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + + - name: Publish package + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + run: | + cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import; + mvn clean deploy -U -P release -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} -DskipTests \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2448ce9f..6d1f55ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,3 +8,4 @@ - [feat:refactor SDKContext as static.](https://github.com/Tencent/spring-cloud-tencent/pull/995) - [Refactoring: Refactor Circuitbreaker ut.](https://github.com/Tencent/spring-cloud-tencent/pull/996) - [fix:fix random port read bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1000) +- [docs:add release GitHub Action.](https://github.com/Tencent/spring-cloud-tencent/pull/1007) diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-tsf-adapter-plugin/src/test/java/com/tencent/cloud/tsf/adapter/config/TsfDiscoveryFlow.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-tsf-adapter-plugin/src/test/java/com/tencent/cloud/tsf/adapter/config/TsfDiscoveryFlow.java index d183d23e..b0283242 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-tsf-adapter-plugin/src/test/java/com/tencent/cloud/tsf/adapter/config/TsfDiscoveryFlow.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-tsf-adapter-plugin/src/test/java/com/tencent/cloud/tsf/adapter/config/TsfDiscoveryFlow.java @@ -37,4 +37,9 @@ public class TsfDiscoveryFlow implements DiscoveryFlow { public void setSDKContext(SDKContext sdkContext) { } + + @Override + public void destroy() { + + } } diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PolarisSDKContextManager.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PolarisSDKContextManager.java index 2f17db82..5aa548d4 100644 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PolarisSDKContextManager.java +++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PolarisSDKContextManager.java @@ -111,8 +111,10 @@ public class PolarisSDKContextManager { assemblyAPI = null; } - sdkContext.destroy(); - sdkContext = null; + if (Objects.nonNull(sdkContext)) { + sdkContext.destroy(); + sdkContext = null; + } LOG.info("Polaris SDK context is destroyed."); } catch (Throwable throwable) {