Merge pull request #188 from zero88/feature/use-shared-gh-workflow

chore(build): use shared-ghactions in `build` GHA job
zero88 · Mar 19, 2024 · 60c0d02 · 60c0d02
2 parents 8f41713 + 10e6e16
commit 60c0d02
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 97 deletions.
diff --git a/.github/actions/gha-build/action.yml b/.github/actions/gha-build/action.yml
diff --git a/.github/workflows/jooqx.yml b/.github/workflows/jooqx.yml
@@ -38,28 +38,20 @@ jobs:
       gpgPassphrase: ${{ secrets.CI_GPG_PASSPHARSE }}
 
   build:
+    uses: zero88/shared-ghactions/.github/workflows/gradle-build.yml@main
     needs: context
     if: needs.context.outputs.shouldBuild == 'true'
     strategy:
       matrix:
         java: [ '8', '11', '17' ]
         os: [ 'ubuntu-latest', 'windows-latest' ]
-    name: Build Java ${{ matrix.java }} (${{ matrix.os }})
-    runs-on: ${{ matrix.os }}
-    env:
-      PROFILE: 'ciBuild'
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build
-        uses: ./.github/actions/gha-build
-        with:
-          profile: ${{ env.PROFILE }}
-          version: ${{ needs.context.outputs.version }}
-          semanticVersion: ${{ needs.context.outputs.semanticVersion }}
-          hashVersion: ${{ needs.context.outputs.commitId }}
-          javaDist: ${{ env.JAVA_DIST }}
-          javaVersion: ${{ matrix.java }}
+    name: Build & Test Java ${{ matrix.java }} (${{ matrix.os }})
+    with:
+      profile: 'jooqx'
+      version: ${{ needs.context.outputs.version }}
+      semanticVersion: ${{ needs.context.outputs.semanticVersion }}
+      hashVersion: ${{ needs.context.outputs.commitId }}
+      javaVersion: ${{ matrix.java }}
 
   analysis:
     needs: context
@@ -183,9 +175,6 @@ jobs:
     needs: [ context, docs ]
     if: needs.context.outputs.shouldPublish == 'true' || needs.context.outputs.isRelease == 'true'
     with:
-      webdocsRepo: 'zero88/webdocs'
-      webdocsRef: 'main'
-      webdocsWorkflow: 'webdocs.yml'
       docCommitMsg: ${{ needs.context.outputs.docCommitMsg }}
     secrets:
       githubToken: ${{ secrets.OSS_GITHUB_TOKEN }}

diff --git a/.github/workflows/jpa.yml b/.github/workflows/jpa.yml
@@ -37,29 +37,20 @@ jobs:
       gpgPassphrase: ${{ secrets.CI_GPG_PASSPHARSE }}
 
   build:
+    uses: zero88/shared-ghactions/.github/workflows/gradle-build.yml@main
     needs: context
     if: needs.context.outputs.shouldBuild == 'true'
     strategy:
       matrix:
         java: [ '8', '11', '17' ]
         os: [ 'ubuntu-latest', 'windows-latest' ]
     name: Build & Test Java ${{ matrix.java }} (${{ matrix.os }})
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build
-        uses: ./.github/actions/gha-build
-        with:
-          profile: ${{ env.PROFILE }}
-          version: ${{ needs.context.outputs.version }}
-          semanticVersion: ${{ needs.context.outputs.semanticVersion }}
-          hashVersion: ${{ needs.context.outputs.commitId }}
-          javaVersion: ${{ matrix.java }}
-
-      - name: Test
-        shell: bash
-        run: ./gradlew test -Pprofile=${{ env.PROFILE }}
+    with:
+      profile: 'jpa'
+      version: ${{ needs.context.outputs.version }}
+      semanticVersion: ${{ needs.context.outputs.semanticVersion }}
+      hashVersion: ${{ needs.context.outputs.commitId }}
+      javaVersion: ${{ matrix.java }}
 
   publish:
     needs: [ context, build ]

diff --git a/.github/workflows/rsql.yml b/.github/workflows/rsql.yml
@@ -36,29 +36,20 @@ jobs:
       gpgPassphrase: ${{ secrets.CI_GPG_PASSPHARSE }}
 
   build:
+    uses: zero88/shared-ghactions/.github/workflows/gradle-build.yml@main
     needs: context
     if: needs.context.outputs.shouldBuild == 'true'
     strategy:
       matrix:
         java: [ '8', '11', '17' ]
         os: [ 'ubuntu-latest', 'windows-latest' ]
     name: Build & Test Java ${{ matrix.java }} (${{ matrix.os }})
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build
-        uses: ./.github/actions/gha-build
-        with:
-          profile: ${{ env.PROFILE }}
-          version: ${{ needs.context.outputs.version }}
-          semanticVersion: ${{ needs.context.outputs.semanticVersion }}
-          hashVersion: ${{ needs.context.outputs.commitId }}
-          javaVersion: ${{ matrix.java }}
-
-      - name: Test
-        shell: bash
-        run: ./gradlew test -Pprofile=${{ env.PROFILE }}
+    with:
+      profile: 'rsql'
+      version: ${{ needs.context.outputs.version }}
+      semanticVersion: ${{ needs.context.outputs.semanticVersion }}
+      hashVersion: ${{ needs.context.outputs.commitId }}
+      javaVersion: ${{ matrix.java }}
 
   docs:
     uses: zero88/shared-ghactions/.github/workflows/antora-docs.yml@main
@@ -87,9 +78,6 @@ jobs:
     needs: [ context, docs ]
     if: needs.context.outputs.shouldPublish == 'true' || needs.context.outputs.isRelease == 'true'
     with:
-      webdocsRepo: 'zero88/webdocs'
-      webdocsRef: 'main'
-      webdocsWorkflow: 'webdocs.yml'
       docCommitMsg: ${{ needs.context.outputs.docCommitMsg }}
     secrets:
       githubToken: ${{ secrets.OSS_GITHUB_TOKEN }}