Skip to content

Commit 2c0251d

Browse files
committed
Enable auto-merge and describe it in CONTRIBUTING
1 parent c22f7da commit 2c0251d

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ jobs:
6161
--title "$BASE: sync with $HEAD" \
6262
--body "Merge relevant changes from \`$HEAD\` into \`$BASE\`.")
6363
echo ""
64-
echo "PR to sync $DEV_BRANCH: $PR"
64+
echo "PR to sync $BASE: $PR"
6565
sleep 10 # allow status checks to be triggered
6666
6767
gh pr checks $PR --watch --required || continue
68-
# gh pr merge $PR --merge --admin
68+
gh pr merge $PR --merge --admin
6969
done
7070
env:
7171
GH_TOKEN: ${{ steps.generate-token.outputs.token }}

CONTRIBUTING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -503,10 +503,9 @@ gitGraph TB:
503503

504504
To keep changes in sync, we have some GitHub actions that open pull requests to take changes from `main` onto the `dev` branch, and from `dev` to each active version branch.
505505

506-
- `sync-main-to-dev` opens a pull request with all the changes from the `main` branch that aren't yet included on `dev`.
507-
- `sync-dev-to-vX.Y-dev` opens pull requests with all the changes from `dev` that aren't yet included on the corresponding `vX.Y-dev` branch.
506+
- `sync-main-to-dev` opens a pull request with all the changes from the `main` branch that aren't yet included on `dev`. This pull request needs a single approval from either maintainers or TSC and can be merged.
507+
- `sync-dev-to-vX.Y-dev` opens pull requests with all the changes from `dev` that aren't yet included on the corresponding `vX.Y-dev` branch. These pull requests are automatically merged if all required status checks pass.
508508

509-
These need a single approval from either maintainers or TSC and can be merged.
510509
The aim is to bring build script and repository documentation changes to the other branches.
511510
Published versions of the specifications and schemas will also move across branches with this approach.
512511

0 commit comments

Comments
 (0)