Fix branch name for merge-triggered workflow runs (#188)

mlr · web-flow · commit 5eac9724a176 · 2025-03-14T15:31:50.000-07:00
diff --git a/.github/workflows/deploy-bundle-preview.yml b/.github/workflows/deploy-bundle-preview.yml
@@ -34,7 +34,7 @@ jobs:
                   exit 1
               fi
           }
-          validate_branch_name "${{ github.event.pull_request.head.ref }}"
+          validate_branch_name "${{ github.event.pull_request.head.ref || github.ref_name }}"
 
       - name: Extract Branch Names
         id: extract_branch
@@ -53,7 +53,7 @@ jobs:
           }
 
           # Transform branch names in form of `refs/heads/main` to `main`
-          draft_branch=$(extract_branch "${{ github.event.pull_request.head.ref }}")
+          draft_branch=$(extract_branch "${{ github.event.pull_request.head.ref || github.ref_name }}")
 
           # Replace / with - in the draft branch name to use as a directory name
           draft_directory=$(echo "$draft_branch" | tr / -)

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ jobs:`
`34`	`34`	`exit 1`
`35`	`35`	`fi`
`36`	`36`	`}`
`37`		`- validate_branch_name "${{ github.event.pull_request.head.ref }}"`
	`37`	`+ validate_branch_name "${{ github.event.pull_request.head.ref \|\| github.ref_name }}"`
`38`	`38`
`39`	`39`	`- name: Extract Branch Names`
`40`	`40`	`id: extract_branch`
`@@ -53,7 +53,7 @@ jobs:`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	# Transform branch names in form of `refs/heads/main` to `main`
`56`		`- draft_branch=$(extract_branch "${{ github.event.pull_request.head.ref }}")`
	`56`	`+ draft_branch=$(extract_branch "${{ github.event.pull_request.head.ref \|\| github.ref_name }}")`
`57`	`57`
`58`	`58`	`# Replace / with - in the draft branch name to use as a directory name`
`59`	`59`	`draft_directory=$(echo "$draft_branch" \| tr / -)`