.

Author: isegall-da

.github/workflows/cluster_tests.yml

@@ -9,6 +9,9 @@ on:
       sha:
         type: string
         required: true
+      splice_url:
+        type: string
+        required: true
 
     outputs:
       result:
@@ -39,5 +42,5 @@ jobs:
         run: |
           set -euo pipefail
           result=$(curl -sSfL -H "Authorization: Bearer ${{ steps.auth.outputs.id_token }}" \
-            "${{ secrets.CLUSTER_TEST_INVOKER_URL }}?workflow=${{ inputs.workflow }}&splice-git-ref=${{ inputs.sha }}")
+            "${{ secrets.CLUSTER_TEST_INVOKER_URL }}?workflow=${{ inputs.workflow }}&splice-git-ref=${{ inputs.sha }}&splice-url=${{ inputs.splice_url }}" \)
           echo "result=$result" >> "$GITHUB_OUTPUT"

.github/workflows/post_merge.yml

@@ -10,33 +10,39 @@ permissions:
 
 jobs:
 
-  get_sha:
+  get_head:
     runs-on: self-hosted-docker-tiny
     outputs:
-      sha: ${{ steps.comment-branch.outputs.head_sha }}
+      sha: ${{ steps.get_head.outputs.sha }}
+      repo: ${{ steps.get_head.outputs.repo }}
     steps:
-      - name: Get PR branch
-        uses: xt0rted/pull-request-comment-branch@e8b8daa837e8ea7331c0003c9c316a64c6d8b0b1 # v3.0.0
-        id: comment-branch
+      - name: Get head SHA & repo
+        id: get_head
+        run: |
+          query='query pullRequestDetails { repository(name: "${{ github.event.repository }}", owner: "${{ github.event.organization }}") { pullRequest(number: ${{ github.event.issue.number }}) { headRef { target { oid } } headRepository { sshUrl } } } }'
+          result=$(gh api graphql -F query="$query")
+          sha=$(echo "$result" | jq -r '.data.repository.pullRequest.headRef.target.oid')
+          repo=$(echo "$result" | jq -r '.data.repository.pullRequest.headRepository.sshUrl')
 
   trigger_cluster_test_basic:
     if: github.event.issue.pull_request && contains(github.event.comment.body, '/cluster_test')
-    needs: get_sha
+    needs: get_head
     uses: ./.github/workflows/cluster_tests.yml
     secrets: inherit
     with:
       workflow: cluster_test
-      sha: ${{ needs.get_sha.outputs.sha }}
+      sha: ${{ needs.get_head.outputs.sha }}
+      splice_url: ${{ needs.get_head.outputs.repo }}
 
   result:
     runs-on: self-hosted-docker-tiny
     needs:
       - trigger_cluster_test_basic
-      - get_sha
+      - get_head
     steps:
       - run: |
           number=$(echo '${{ needs.trigger_cluster_test_basic.outputs.result }}' | jq -r '.number')
-          echo "Deploy scratchnet pipeline triggered for [PR as of ${{ needs.get_sha.outputs.sha }}](https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}/files/${{ needs.get_sha.outputs.sha }}), please approve it in CircleCI: https://app.circleci.com/pipelines/github/DACH-NY/canton-network-internal/${number}"
+          echo "Deploy scratchnet pipeline triggered for [commit ${{ needs.get_head.outputs.sha }} in ${{ needs.get_head.outputs.repo }}](https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}/files/${{ needs.get_head.outputs.sha }}), please approve it in CircleCI: https://app.circleci.com/pipelines/github/DACH-NY/canton-network-internal/${number}"
 
 
   trigger_cluster_test_hdm: