Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite926701

Browse files
fix: improve PR number detection logic for different event types
- Handle pull_request events using github.event.number- Handle push events by finding PR for the branch- Improve error handling and validation for PR state checking- Fix issue where gh pr view failed on merge commitsCo-authored-by: matifali <10648092+matifali@users.noreply.github.com>
1 parentd01e3f8 commite926701

File tree

1 file changed

+19
-9
lines changed

1 file changed

+19
-9
lines changed

‎.github/workflows/pr-deploy.yaml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,15 @@ jobs:
106106
set -euo pipefail
107107
if [[ "${{ github.event_name }}" == "issue_comment" ]]; then
108108
echo "pr_number=${{ needs.check_comment_trigger.outputs.PR_NUMBER }}" >> $GITHUB_OUTPUT
109+
elif [[ "${{ github.event_name }}" == "pull_request" ]]; then
110+
echo "pr_number=${{ github.event.number }}" >> $GITHUB_OUTPUT
109111
else
110-
pr_number=$(gh pr view --json number | jq -r '.number')
112+
# For push events, find the PR for this branch
113+
pr_number=$(gh pr list --head "${{ github.ref_name }}" --json number --jq '.[0].number')
114+
if [[ "$pr_number" == "null" || -z "$pr_number" ]]; then
115+
echo "No PR found for branch ${{ github.ref_name }}"
116+
exit 1
117+
fi
111118
echo "pr_number=$pr_number" >> $GITHUB_OUTPUT
112119
fi
113120
env:
@@ -118,15 +125,18 @@ jobs:
118125
run:|
119126
set -euo pipefail
120127
pr_open=true
121-
if [[ "${{ github.event_name }}" == "issue_comment" ]]; then
122-
# For comment triggers, check the specific PR
123-
pr_state=$(gh pr view ${{ steps.get_pr_number.outputs.pr_number }} --json state | jq -r '.state')
124-
else
125-
pr_state=$(gh pr view --json state | jq -r '.state')
126-
fi
128+
pr_number=${{ steps.get_pr_number.outputs.pr_number }}
127129
128-
if [[ "$pr_state" != "OPEN" ]]; then
129-
echo "PR doesn't exist or is closed."
130+
if [[ -n "$pr_number" && "$pr_number" != "null" ]]; then
131+
pr_state=$(gh pr view $pr_number --json state | jq -r '.state')
132+
if [[ "$pr_state" != "OPEN" ]]; then
133+
echo "PR $pr_number is not open (state: $pr_state)"
134+
pr_open=false
135+
else
136+
echo "PR $pr_number is open"
137+
fi
138+
else
139+
echo "No valid PR number found"
130140
pr_open=false
131141
fi
132142
echo "pr_open=$pr_open" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp