Skip to content

Commit b9a5f2c

Browse files
fix bug in create PR code (#588)
1 parent 5dc5bb7 commit b9a5f2c

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
TAG="${{ github.event.inputs.tag }}"
112112
113113
# Create PR from next to main
114-
PR_RESPONSE=$(gh pr create \
114+
PR_URL=$(gh pr create \
115115
--base main \
116116
--head next \
117117
--title "Release ${TAG}" \
@@ -123,11 +123,9 @@ jobs:
123123
- [ ] Verify the release notes in the draft release
124124
- [ ] Merge this PR after the release is published
125125
126-
Created by the automated release workflow." \
127-
--json number,url)
126+
Created by the automated release workflow.")
128127
129-
PR_NUMBER=$(echo "$PR_RESPONSE" | jq -r '.number')
130-
PR_URL=$(echo "$PR_RESPONSE" | jq -r '.url')
128+
PR_NUMBER=$(echo "$PR_URL" | sed 's|.*/pull/||')
131129
132130
echo "pr-number=${PR_NUMBER}" >> $GITHUB_OUTPUT
133131
echo "pr-url=${PR_URL}" >> $GITHUB_OUTPUT

.github/workflows/sync-next-branch.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
AHEAD_COUNT="${{ steps.branch-status.outputs.ahead-count }}"
8686
8787
# Create PR from main to next
88-
PR_RESPONSE=$(gh pr create \
88+
PR_URL=$(gh pr create \
8989
--base next \
9090
--head main \
9191
--title "Sync next branch with main" \
@@ -106,11 +106,10 @@ jobs:
106106
> **Note**: This PR was automatically created by the daily branch sync workflow.
107107
> If you have any concerns about these changes, please review them carefully before merging." \
108108
--label "automated" \
109-
--label "sync" \
110-
--json number,url)
109+
--label "sync")
111110
112-
PR_NUMBER=$(echo "$PR_RESPONSE" | jq -r '.number')
113-
PR_URL=$(echo "$PR_RESPONSE" | jq -r '.url')
111+
# Extract PR number from URL (e.g., https://github.com/owner/repo/pull/123 -> 123)
112+
PR_NUMBER=$(echo "$PR_URL" | sed 's|.*/pull/||')
114113
115114
echo "pr-number=${PR_NUMBER}" >> $GITHUB_OUTPUT
116115
echo "pr-url=${PR_URL}" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)