Tidy up actions

hsbc · Aug 15, 2024 · 7c1c361 · 7c1c361
1 parent 498428c
commit 7c1c361
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml
@@ -37,9 +37,8 @@ jobs:
               "configuration": {}
             }]
 
-      - name: Upload snapshot
-        run: mvn \
-            --no-transfer-progress \
-            --batch-mode \
-            -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} \
-            clean deploy
+      - name: Verify package
+        run: mvn --batch-mode verify
+
+      - name: Release package
+        run: mvn --batch-mode -DskipTests=true releaser:release
diff --git a/.github/workflows/snapshot-build.yaml b/.github/workflows/snapshot-build.yaml
@@ -40,16 +40,24 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
-      - id: publish-to-central-and-docker
-        name: Publish to Central Repository and Docker
-        env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+      - name: Set up maven settings
+        uses: s4u/maven-settings-action@v2.8.0
+        with:
+          servers: |
+            [{
+              "id": "ossrh",
+              "username": "${{ secrets.OSSRH_USER_V2 }}",
+              "password": "${{ secrets.OSSRH_TOKEN_V2 }}"
+            },
+            {
+              "id": "gpg.passphrase",
+              "passphrase": "${{ secrets.GPG_SECRET_KEY_PASSWORD }}",
+              "configuration": {}
+            }]
 
+      - name: Upload snapshot
         run: |
           mvn \
             --no-transfer-progress \
             --batch-mode \
-            -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} \
             clean deploy