From 17ba9e3e8b20d63724a2d5e27f96f948d6bb66da Mon Sep 17 00:00:00 2001
From: Shirshanka Das <shirshanka@apache.org>
Date: Tue, 8 Feb 2022 12:47:54 -0800
Subject: [PATCH] fix(ci): fix datahub jar publish action

---
 .github/workflows/publish-datahub-jars.yml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/publish-datahub-jars.yml b/.github/workflows/publish-datahub-jars.yml
index c44f627511794..8bb33e17ba7ef 100644
--- a/.github/workflows/publish-datahub-jars.yml
+++ b/.github/workflows/publish-datahub-jars.yml
@@ -1,11 +1,6 @@
 name: Publish Datahub Client
 
 on:
-  workflow_run:
-    workflows: ["build & test"]
-    types:
-      - completed
-
   release:
     types: [published, edited]
 
@@ -18,18 +13,19 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     outputs:
-      publish-enabled: ${{ steps.publish-enabled.outputs.defined }}
+      publish-enabled: ${{ steps.publish-enabled.outputs.publish }}
     steps:
       - id: publish-enabled
-        if: "${{ secrets.SIGNING_KEY != '' }}"
-        run: echo "::set-output name=defined::true"
         env:
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+        run: |
+          echo "Enable publish: ${{ env.SIGNING_KEY != '' }}"
+          echo "::set-output name=publish::${{ env.SIGNING_KEY != '' }}"
 
   publish:
     runs-on: ubuntu-latest
     needs: [check-secret]
-    if: needs.check-secret.outputs.publish-enabled == 'true'
+    if: ${{ needs.publish-enabled.outputs.publish == 'true' }}
     steps:
       - uses: actions/checkout@v2
         with:
@@ -56,8 +52,8 @@ jobs:
         run: |
           echo signingKey=$SIGNING_KEY >> gradle.properties
           ./gradlew :metadata-integration:java:datahub-client:printVersion
-          ./gradlew :metadata-integration:java:datahub-client:publishToMavenLocal
-          #./gradlew :metadata-integration:java:datahub-client:closeAndReleaseRepository --info
+          ./gradlew :metadata-integration:java:datahub-client:publish
+          ./gradlew :metadata-integration:java:datahub-client:closeAndReleaseRepository --info
       - name: publish datahub-spark jar
         env:
           RELEASE_USERNAME: ${{ secrets.RELEASE_USERNAME }}
@@ -69,5 +65,5 @@ jobs:
         run: |
           echo signingKey=$SIGNING_KEY >> gradle.properties
           ./gradlew :metadata-integration:java:spark-lineage:printVersion
-          ./gradlew :metadata-integration:java:spark-lineage:publishToMavenLocal
-          #./gradlew :metadata-integration:java:datahub-client:closeAndReleaseRepository --info
+          ./gradlew :metadata-integration:java:spark-lineage:publish
+          ./gradlew :metadata-integration:java:datahub-client:closeAndReleaseRepository --info