[GHA] Some small CI optimization

zero88 · Apr 3, 2022 · 0aab871 · 0aab871
1 parent facd5ca
commit 0aab871
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/.github/workflows/jooqx.yml b/.github/workflows/jooqx.yml
@@ -159,7 +159,7 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: [ context, build, analysis, publish ]
+    needs: [ context, publish, docs ]
     if: needs.context.outputs.isRelease == 'true'
     steps:
       - name: Create GitHub Release

diff --git a/.github/workflows/jpa.yml b/.github/workflows/jpa.yml
@@ -77,7 +77,7 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: [ context, build, publish ]
+    needs: [ context, publish ]
     if: needs.context.outputs.isRelease == 'true'
     steps:
       - name: Create GitHub Release

diff --git a/.github/workflows/rsql.yml b/.github/workflows/rsql.yml
@@ -59,9 +59,9 @@ jobs:
         run: ./gradlew test -Pprofile=${{ env.PROFILE }}
 
   docs:
-    runs-on: ubuntu-latest
     needs: [ context, build ]
     if: needs.context.outputs.shouldPublish == 'true' || needs.context.outputs.isRelease == 'true'
+    runs-on: ubuntu-latest
     env:
       REPO: zero88/jooqx
       REF: main
@@ -104,9 +104,9 @@ jobs:
       gpgPassphrase: ${{ secrets.CI_GPG_PASSPHARSE }}
 
   release:
-    runs-on: ubuntu-latest
-    needs: [ context, build, publish ]
+    needs: [ context, publish, docs ]
     if: needs.context.outputs.isRelease == 'true'
+    runs-on: ubuntu-latest
     steps:
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v1

diff --git a/.github/workflows/subwf-publish.yml b/.github/workflows/subwf-publish.yml
@@ -48,8 +48,9 @@ on:
         required: true
 
 jobs:
-  publish:
-    name: Publish to registry
+  publish-snapshot:
+    name: Publish to Nexus Snapshot
+    if: inputs.isRelease != 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2.4.0
@@ -60,8 +61,7 @@ jobs:
           java-version: ${{ inputs.javaVersion }}
           cache: 'gradle'
 
-      - name: Publish Sonatype OSSRH Snapshot
-        if: inputs.isRelease != 'true'
+      - name: Publish
         shell: bash
         run: |
           args=( -Pprofile=${{ inputs.profile }} \
@@ -71,17 +71,28 @@ jobs:
                  -Pnexus.password=${{ secrets.ossrhToken }} )
           ./gradlew publish "${args[@]}"
 
+  publish-release:
+    name: Publish to Nexus Release
+    if: inputs.isRelease == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.4.0
+
+      - uses: actions/setup-java@v2
+        with:
+          distribution: ${{ inputs.javaDist }}
+          java-version: ${{ inputs.javaVersion }}
+          cache: 'gradle'
+
       - name: Import GPG key
         id: import_gpg
-        if: inputs.isRelease == 'true'
         uses: crazy-max/ghaction-import-gpg@v3
         with:
           git-user-signingkey: true
           gpg-private-key: ${{ secrets.gpgKey }}
           passphrase: ${{ secrets.gpgPassphrase }}
 
-      - name: Publish Sonatype OSSRH
-        if: inputs.isRelease == 'true'
+      - name: Publish
         shell: bash
         run: |
           args=( -Pprofile=${{ inputs.profile }} \