Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 82111b9

Browse files
committed
Also merge SyTest branches on full release
1 parent c0ce839 commit 82111b9

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

scripts-dev/release.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,12 +502,20 @@ def merge_back() -> None:
502502
_merge_into(synapse_repo, branch_name, "develop")
503503
else:
504504
# Full release
505+
sytest_repo = get_repo_and_check_clean_checkout("../sytest", "sytest")
506+
505507
if click.confirm(f"Merge {branch_name} → master?", default=True):
506508
_merge_into(synapse_repo, branch_name, "master")
507509

508510
if click.confirm("Merge master → develop?", default=True):
509511
_merge_into(synapse_repo, "master", "develop")
510512

513+
if click.confirm(f"On SyTest, merge {branch_name} → master?", default=True):
514+
_merge_into(sytest_repo, branch_name, "master")
515+
516+
if click.confirm("On SyTest, merge master → develop?", default=True):
517+
_merge_into(sytest_repo, "master", "develop")
518+
511519

512520
@cli.command()
513521
def announce() -> None:

0 commit comments

Comments
 (0)