Merge pull request JeffersonLab#138 from c-dilks/fix-push-dispatch

baltzell · web-flow · commit 726419ee28f8 · 2023-10-13T16:21:48.000-04:00
fix: payload branch and URL for `push` dispatch triggers
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -34,6 +34,6 @@ jobs:
               "actor": "${{ github.actor }}",
               "source": "${{ github.event.repository.name }}",
               "title": "${{ steps.sanitize.outputs.title }}",
-              "source_url": "${{ github.event.pull_request.html_url }}",
-              "git_coatjava": "{\"fork\": \"${{ github.repository }}\", \"branch\": \"${{ github.head_ref || github.ref }}\" }"
+              "source_url": "${{ github.event.pull_request.html_url || github.event.head_commit.url }}",
+              "git_coatjava": "{\"fork\": \"${{ github.repository }}\", \"branch\": \"${{ github.head_ref || github.ref_name }}\" }"
             }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@ jobs:`
`34`	`34`	`"actor": "${{ github.actor }}",`
`35`	`35`	`"source": "${{ github.event.repository.name }}",`
`36`	`36`	`"title": "${{ steps.sanitize.outputs.title }}",`
`37`		`- "source_url": "${{ github.event.pull_request.html_url }}",`
`38`		`- "git_coatjava": "{\"fork\": \"${{ github.repository }}\", \"branch\": \"${{ github.head_ref \|\| github.ref }}\" }"`
	`37`	`+ "source_url": "${{ github.event.pull_request.html_url \|\| github.event.head_commit.url }}",`
	`38`	`+ "git_coatjava": "{\"fork\": \"${{ github.repository }}\", \"branch\": \"${{ github.head_ref \|\| github.ref_name }}\" }"`
`39`	`39`	`}`