Skip to content

Commit 83d687a

Browse files
authored
Merge pending PR in workflow (#3)
1 parent 1f05a3f commit 83d687a

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

.github/workflows/upstream-sync.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ jobs:
124124
- name: Reset update-test to upstream/main
125125
run: git reset --hard upstream/main
126126

127+
- name: Merge Pending Upstream PRs
128+
run: |
129+
git fetch upstream pull/2086/head:pr-2086
130+
git fetch upstream pull/2087/head:pr-2087
131+
git merge pr-2086 pr-2087 --no-edit
132+
127133
- name: Cherry-pick "Fix for asterinas" commit
128134
run: |
129135
COMMIT_SHA=$(git log main --grep="Fix for asterinas" --pretty=format:"%H" -n 1)

0 commit comments

Comments
 (0)