Update GHA - fix inputs, outputs

DataBiosphere · Aug 3, 2023 · f8f2edd · f8f2edd
1 parent 96d1b03
commit f8f2edd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -95,12 +95,14 @@ jobs:
     if: success() && github.ref == 'refs/heads/main'
 
   publish-library:
-    needs: [ build, unit-tests-and-sonarqube, source-clear, tag ]
+    needs: [ tag ]
     uses: ./.github/workflows/publish.yml
     if: success() && github.ref == 'refs/heads/main'
+    with:
+      tag: ${{ needs.tag.outputs.tag }}
 
   release-cli:
-    needs: [ build, unit-tests-and-sonarqube, source-clear, tag, publish-library ]
+    needs: [ tag ]
     uses: ./.github/workflows/release-cli.yml
     if: success() && github.ref == 'refs/heads/main'
     with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,5 +1,10 @@
 name: Publish Library to Artifactory
-on: workflow_call
+on:
+  workflow_call:
+    inputs:
+      tag:
+        required: true
+        type: string
 
 env:
   SERVICE_NAME: ${{ github.event.repository.name }}
@@ -12,21 +17,18 @@ jobs:
       contents: 'read'
       id-token: 'write'
     runs-on: ubuntu-latest
-    outputs:
-      tag: ${{ steps.tag.outputs.tag }}
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.tag }}
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
 
-      - name: Parse tag
-        id: tag
-        run: echo "tag=$(git describe --tags)" >> $GITHUB_OUTPUT
-
       - name: Publish Library Artifactory
         run: ./gradlew --build-cache :library:artifactoryPublish
         env:

diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v3
         with:
-          ref: ${{ needs.tag-job.outputs.tag }}
+          ref: ${{ inputs.tag }}
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
@@ -25,9 +25,9 @@ jobs:
           ./gradlew --build-cache :cli:jar
           ./gradlew --build-cache :cli:assembleDist
       - name: Create tagged release with CLI jar
-        run: gh release create ${{ needs.tag-job.outputs.tag }} 'cli/build/libs/java-pfb-cli-${{ needs.tag-job.outputs.tag }}.jar' 'cli/build/distributions/cli-${{ needs.tag-job.outputs.tag }}.zip' --generate-notes --verify-tag
+        run: gh release create ${{ inputs.tag }} 'cli/build/libs/java-pfb-cli-${{ inputs.tag }}.jar' 'cli/build/distributions/cli-${{ inputs.tag }}.zip' --generate-notes --verify-tag
         env:
-          GH_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Notify slack on failure
         uses: broadinstitute/action-slack@v3.8.0
         if: failure()