Skip to content

Commit 1f3374c

Browse files
authored
Merge pull request #4829 from OAI/dev-merge-main
dev: update from main
2 parents 9281b81 + 53e56bf commit 1f3374c

File tree

6 files changed

+265
-110
lines changed

6 files changed

+265
-110
lines changed

.github/workflows/sync-dev-to-vX.Y-dev.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ jobs:
4242
continue
4343
fi
4444
45-
gh pr create --base $BASE --head $HEAD \
45+
PR=$(gh pr create --base $BASE --head $HEAD \
4646
--label "Housekeeping" \
4747
--title "$BASE: update from $HEAD" \
48-
--body "Merge \`$HEAD\` into \`$BASE\`."
48+
--body "Merge \`$HEAD\` into \`$BASE\`.")
49+
gh pr merge $PR --merge --admin
4950
done
5051
env:
5152
GH_TOKEN: ${{ steps.generate-token.outputs.token }}

0 commit comments

Comments
 (0)