Skip to content

Commit 86ae22b

Browse files
committed
ci: Update auto-update job (box/box-codegen#855)
1 parent a5ec8ec commit 86ae22b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.codegen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "engineHash": "52d5b2e", "specHash": "1ed059a", "version": "10.0.0" }
1+
{ "engineHash": "504b5a7", "specHash": "1ed059a", "version": "10.0.0" }

.github/workflows/autoupdate-pr.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: Autoupdate PR
22
on:
33
push:
44
branches:
5+
- main
56
- sdk-gen
7+
- combined-sdk
68

79
jobs:
810
update_pull_requests:
@@ -24,10 +26,10 @@ jobs:
2426

2527
- name: Auto update pull requests
2628
run: |
27-
PR_LIST=$(curl -s -H "Authorization: Bearer ${{ secrets.DISPATCH_ACCESS_TOKEN }}" "https://api.github.com/repos/$GITHUB_REPOSITORY/pulls?state=open" | jq -r '.[] | .head.ref')
29+
PR_LIST=$(curl -s -H "Authorization: Bearer ${{ secrets.DISPATCH_ACCESS_TOKEN }}" "https://api.github.com/repos/$GITHUB_REPOSITORY/pulls?state=open&head=${{ github.ref_name }}" | jq -r '.[] | .head.ref')
2830
for pr_branch in $PR_LIST; do
2931
git checkout "$pr_branch"
30-
if git merge origin/sdk-gen; then
32+
if git merge origin/${{ github.ref_name }}; then
3133
git push
3234
else
3335
# Conflict occurred, resolve by keeping our changes

0 commit comments

Comments
 (0)