File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed
Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change 1- { "engineHash" : " 52d5b2e " , "specHash" : " 1ed059a" , "version" : " 10.0.0" }
1+ { "engineHash" : " 504b5a7 " , "specHash" : " 1ed059a" , "version" : " 10.0.0" }
Original file line number Diff line number Diff line change @@ -2,7 +2,9 @@ name: Autoupdate PR
22on :
33 push :
44 branches :
5+ - main
56 - sdk-gen
7+ - combined-sdk
68
79jobs :
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
You can’t perform that action at this time.
0 commit comments