Update publish.yml

jakelauer · May 22, 2024 · 217d994 · 217d994
1 parent 65a0ca7
commit 217d994
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -23,8 +23,8 @@ jobs:
         id: get-build-run-id
         run: |
           echo "Fetching the Build Workflow Run ID..."
-          BUILD_RUN_ID=$(gh run list --repo jakelauer/theseus-js --workflow=build.yml --limit=1 | awk '{print $1}')
-          echo "::set-output name=run_id::$BUILD_RUN_ID"
+          BUILD_RUN_ID=$(gh run list --repo jakelauer/theseus-js --workflow=build.yml --limit=1 --json databaseId,status --jq '.[] | select(.status=="in_progress" or .status=="queued" or .status=="completed") | .databaseId')
+          echo "run_id=$BUILD_RUN_ID" >> $GITHUB_ENV
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -35,7 +35,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Wait for Build to Complete
-        run: gh run watch ${{ needs.trigger-build.outputs.build_workflow_run_id }}
+        run: gh run watch ${{ env.run_id }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -55,8 +55,8 @@ jobs:
         id: get-test-run-id
         run: |
           echo "Fetching the Test Workflow Run ID..."
-          TEST_RUN_ID=$(gh run list --repo jakelauer/theseus-js --workflow=test.yml --limit=1 | awk '{print $1}')
-          echo "::set-output name=run_id::$TEST_RUN_ID"
+          TEST_RUN_ID=$(gh run list --repo jakelauer/theseus-js --workflow=test.yml --limit=1 --json databaseId,status --jq '.[] | select(.status=="in_progress" or .status=="queued" or .status=="completed") | .databaseId')
+          echo "run_id=$TEST_RUN_ID" >> $GITHUB_ENV
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -67,7 +67,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Wait for Test to Complete
-        run: gh run watch ${{ needs.trigger-test.outputs.test_workflow_run_id }}
+        run: gh run watch ${{ env.run_id }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}