We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 1f05a3f commit 83d687aCopy full SHA for 83d687a
.github/workflows/upstream-sync.yml
@@ -124,6 +124,12 @@ jobs:
124
- name: Reset update-test to upstream/main
125
run: git reset --hard upstream/main
126
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
+
133
- name: Cherry-pick "Fix for asterinas" commit
134
run: |
135
COMMIT_SHA=$(git log main --grep="Fix for asterinas" --pretty=format:"%H" -n 1)
0 commit comments