CI: Fix tutorial GHA

mgxd · effigies · commit 51788871d9a8 · 2022-09-21T08:41:06.000-04:00
diff --git a/.github/workflows/tutorials.yml b/.github/workflows/tutorials.yml
@@ -13,49 +13,55 @@ jobs:
   tutorial:
     runs-on: ubuntu-latest
     env:
-      BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+      BRANCH_NAME: ${{ github.ref_name }}
     steps:
       - name: Start time
         id: start
         run: echo "::set-output name=start_time::$(date +'%Y-%m-%dT%H:%M:%S%z')"
       - name: Trigger Nipype tutorial Github Action
         run: |
+          set -x
           curl -X POST \
           -H "Authorization: Bearer ${{ secrets.TUTORIAL_ACCESS_TOKEN }}" \
           -H "Accept: application/vnd.github+json" \
           https://api.github.com/repos/miykael/nipype_tutorial/actions/workflows/testing.yml/dispatches \
-          -d '{"nipype_branch": "'${BRANCH_NAME:4}'"}'
+          -d '{"ref": "master", "inputs": {"nipype_branch": "'${BRANCH_NAME}'"}}'
+          sleep 10
       - name: Check Action was successfully dispatched
         id: dispatched
         run: |
-          RUN_ID=$(curl -X POST \
-            -H "Accept: application/vnd.github+json" \
-            "https://api.github.com/repos/miykael/nipype_tutorial/actions/runs?created=>${{ steps.start.outputs.start_time }}&per_page=1" \
+          set -x
+          START=${{ steps.start.outputs.start_time }}
+          RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
+            'https://api.github.com/repos/miykael/nipype_tutorial/actions/runs?created=>'${START}'&per_page=1' \
             | jq -r '.workflow_runs[0].id')
 
           # fail if not extracted
           [[ -n $RUN_ID ]] || exit 1
-          echo "::set-output name=run_id::$RUN_ID""
+          echo "::set-output name=run_id::$RUN_ID"
       - name: Check if action completed
-        timeout-minutes: 60
+        timeout-minutes: 120
         run: |
+          set -x
+          RUN_ID=${{ steps.dispatched.outputs.run_id }}
           while :
           do
             TIMESTAMP=$(date +'%Y-%m-%dT%H:%M:%S%z')
             # check status every 5 minutes
             STATUS=$(curl -H "Accept: application/vnd.github+json" \
-            "https://api.github.com/repos/miykael/nipype_tutorial/actions/runs/${{ steps.dispatched.outputs.run_id }}" \
+            https://api.github.com/repos/miykael/nipype_tutorial/actions/runs/${RUN_ID} \
             | jq -r '.conclusion')
             case $STATUS in
             success)
-              echo "[$TIMESTAMP] Tutorial run ${{ steps.dispatched.outputs.run_id }} completed successfully."
+              echo "[$TIMESTAMP] Tutorial run $RUN_ID completed successfully."
               exit 0
-            ;;
+              ;;
             failure)
-              echo "[$TIMESTAMP] Tutorial run ${{ steps.dispatched.outputs.run_id }} failed."
+              echo "[$TIMESTAMP] Tutorial run $RUN_ID failed."
               exit 1
-            ;;
+              ;;
             *)
               echo "[$TIMESTAMP] Conclusion ($STATUS) is not yet complete"
               sleep 300
+            esac
           done
