optimize: update expire gpg key and publish workflow (apache#5549)

Signed-off-by: slievrly <slievrly@163.com>
Pil0tXia · May 4, 2023 · 0a1edf3 · 0a1edf3
1 parent 1c8e4bf
commit 0a1edf3
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 35 deletions.
diff --git a/.github/workflows/publishes.yml → .github/workflows/publish-docker.yml b/.github/workflows/publishes.yml → .github/workflows/publish-docker.yml
@@ -1,4 +1,4 @@
-name: "Publishes"
+name: "Publish Docker Image"
 
 on:
   push:
@@ -11,39 +11,6 @@ on:
 
 jobs:
   # job 1
-  publish-to-OSSRH:
-    name: "Publish to OSSRH"
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      # step 1
-      - name: "Checkout"
-        uses: actions/checkout@v3
-      # step 2
-      - name: "Setup Java JDK"
-        uses: actions/setup-java@v3.9.0
-        with:
-          distribution: 'zulu'
-          java-version: 8
-          server-id: oss_seata
-          server-username: OSSRH_USERNAME # Environment variable name for the username for authentication to the Apache Maven repository. Default is $GITHUB_ACTOR
-          server-password: OSSRH_PASSWORD # Environment variable name for password or token for authentication to the Apache Maven repository. Default is $GITHUB_TOKEN
-          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
-          gpg-passphrase: GPG_PASSPHRASE # Environment variable name for the GPG private key passphrase. Default is $GPG_PASSPHRASE
-      # step 3
-      - name: "Print maven version"
-        run: ./mvnw -version
-      # step 4
-      - name: "Publish to OSSRH"
-        env:
-          OSSRH_USERNAME: ${{ secrets.OSSRH_USER }}
-          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-        run: |
-          ./mvnw -T 4C clean deploy -Prelease,release-by-github-actions -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-
-  # job 2
   publish-images-to-dockerhub:
     name: "Publish images to DockerHub"
     runs-on: ubuntu-latest

diff --git a/.github/workflows/publish-ossrh.yml b/.github/workflows/publish-ossrh.yml
@@ -0,0 +1,39 @@
+name: "Publish OSSRH"
+
+on:
+  push:
+    branches: [ develop, 2.x, snapshot, "*.*.*" ]
+
+jobs:
+  # job 1
+  publish-to-OSSRH:
+    name: "Publish to OSSRH"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      # step 1
+      - name: "Checkout"
+        uses: actions/checkout@v2.4.0
+      # step 2
+      - name: "Setup Java JDK"
+        uses: actions/setup-java@v3.9.0
+        with:
+          distribution: 'zulu'
+          java-version: 8
+          server-id: oss_seata
+          server-username: OSSRH_USERNAME # Environment variable name for the username for authentication to the Apache Maven repository. Default is $GITHUB_ACTOR
+          server-password: OSSRH_PASSWORD # Environment variable name for password or token for authentication to the Apache Maven repository. Default is $GITHUB_TOKEN
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg-passphrase: GPG_PASSPHRASE # Environment variable name for the GPG private key passphrase. Default is $GPG_PASSPHRASE
+      # step 3
+      - name: "Print maven version"
+        run: ./mvnw -version
+      # step 4
+      - name: "Publish to OSSRH"
+        env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USER }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+        run: |
+          ./mvnw -T 4C clean deploy -Prelease,release-by-github-actions -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
diff --git a/build/pom.xml b/build/pom.xml
@@ -120,7 +120,7 @@
         <license.skip>true</license.skip>
         <maven.test.skip>false</maven.test.skip>
         <maven.surefire.argLine></maven.surefire.argLine>
-        <gpg.keyname>A1C4DAB9B220DBA0C277E945D6A1420D747D1EE0</gpg.keyname>
+        <gpg.keyname>37F181C60AACE24BD5C1D3925583F79497E8E293</gpg.keyname>
         <gpg.arg1/>
         <gpg.arg2/>
 

diff --git a/changes/en-us/2.0.0.md b/changes/en-us/2.0.0.md
@@ -84,6 +84,7 @@ The version is updated as follows:
 - [[#5519](https://github.com/seata/seata/pull/5519)] optimize FenceHandler for oracle
 - [[#5501](https://github.com/seata/seata/pull/5501)] support updating transaction state with optimistic locking
 - [[#5419](https://github.com/seata/seata/pull/5419)] optimize images based on java 8/17 and support maven-3.9.0
+- [[#5549](https://github.com/seata/seata/pull/5549)] update expire gpg key and publish workflow
 
 ### test:
 - [[#5308](https://github.com/seata/seata/pull/5308)] add unit test [FileLoader, ObjectHolder, StringUtils]

diff --git a/changes/zh-cn/2.0.0.md b/changes/zh-cn/2.0.0.md
@@ -83,6 +83,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
 - [[#5519](https://github.com/seata/seata/pull/5519)] 优化 Oracle FenceHandler
 - [[#5501](https://github.com/seata/seata/pull/5501)] 支持乐观锁方式更新事务状态
 - [[#5419](https://github.com/seata/seata/pull/5419)] 优化镜像发布流水线支持jdk8/17和支持maven 3.9.0
+- [[#5549](https://github.com/seata/seata/pull/5549)] 优化 gpg key 和 发布流水线
 
 ### security:
 - [[#5172](https://github.com/seata/seata/pull/5172)] 修复一些安全漏洞的版本