Skip to content

chore: Update auto-update job #1087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 3, 2025
+6 −3
Merged

chore: Update auto-update job #1087

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43f63cd
chore: Update auto-update job
lukaszsocha2 Oct 2, 2025
fd2497c
just filter PRs opened by box-sdk-build
lukaszsocha2 Oct 2, 2025
4f47981
fix
lukaszsocha2 Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/autoupdate-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@ jobs:

- name: Auto update pull requests
run: |
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')
PR_LIST=$(curl -s -H "Authorization: Bearer ${{ secrets.DISPATCH_ACCESS_TOKEN }}" \
"https://api.github.com/repos/$GITHUB_REPOSITORY/pulls?state=open&base=${{ github.ref_name }}" \
| jq -r '.[] | select(.user.login=="box-sdk-build") | .head.ref')

for pr_branch in $PR_LIST; do
git checkout "$pr_branch"
if git merge origin/combined-sdk; then
if git merge origin/${{ github.ref_name }}; then
git push
else
# Conflict occurred, resolve by keeping our changes
Expand All @@ -36,4 +39,4 @@ jobs:
git commit -m "Auto resolve conflict by keeping our changes"
git push
fi
done
done