mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-12-16 13:24:19 -05:00
Add a merge-back
command to the release script, which automates merging the correct branches after a release. (#13393)
This commit is contained in:
parent
8d317f6da5
commit
1c910e2216
1
changelog.d/13393.misc
Normal file
1
changelog.d/13393.misc
Normal file
@ -0,0 +1 @@
|
|||||||
|
Add a `merge-back` command to the release script, which automates merging the correct branches after a release.
|
@ -32,6 +32,7 @@ import click
|
|||||||
import commonmark
|
import commonmark
|
||||||
import git
|
import git
|
||||||
from click.exceptions import ClickException
|
from click.exceptions import ClickException
|
||||||
|
from git import GitCommandError, Repo
|
||||||
from github import Github
|
from github import Github
|
||||||
from packaging import version
|
from packaging import version
|
||||||
|
|
||||||
@ -78,6 +79,8 @@ def cli() -> None:
|
|||||||
|
|
||||||
# Optional: generate some nice links for the announcement
|
# Optional: generate some nice links for the announcement
|
||||||
|
|
||||||
|
./scripts-dev/release.py merge-back
|
||||||
|
|
||||||
./scripts-dev/release.py announce
|
./scripts-dev/release.py announce
|
||||||
|
|
||||||
If the env var GH_TOKEN (or GITHUB_TOKEN) is set, or passed into the
|
If the env var GH_TOKEN (or GITHUB_TOKEN) is set, or passed into the
|
||||||
@ -441,6 +444,79 @@ def upload() -> None:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _merge_into(repo: Repo, source: str, target: str) -> None:
|
||||||
|
"""
|
||||||
|
Merges branch `source` into branch `target`.
|
||||||
|
Pulls both before merging and pushes the result.
|
||||||
|
"""
|
||||||
|
|
||||||
|
# Update our branches and switch to the target branch
|
||||||
|
for branch in [source, target]:
|
||||||
|
click.echo(f"Switching to {branch} and pulling...")
|
||||||
|
repo.heads[branch].checkout()
|
||||||
|
# Pull so we're up to date
|
||||||
|
repo.remote().pull()
|
||||||
|
|
||||||
|
assert repo.active_branch.name == target
|
||||||
|
|
||||||
|
try:
|
||||||
|
# TODO This seemed easier than using GitPython directly
|
||||||
|
click.echo(f"Merging {source}...")
|
||||||
|
repo.git.merge(source)
|
||||||
|
except GitCommandError as exc:
|
||||||
|
# If a merge conflict occurs, give some context and try to
|
||||||
|
# make it easy to abort if necessary.
|
||||||
|
click.echo(exc)
|
||||||
|
if not click.confirm(
|
||||||
|
f"Likely merge conflict whilst merging ({source} → {target}). "
|
||||||
|
f"Have you resolved it?"
|
||||||
|
):
|
||||||
|
repo.git.merge("--abort")
|
||||||
|
return
|
||||||
|
|
||||||
|
# Push result.
|
||||||
|
click.echo("Pushing...")
|
||||||
|
repo.remote().push()
|
||||||
|
|
||||||
|
|
||||||
|
@cli.command()
|
||||||
|
def merge_back() -> None:
|
||||||
|
"""Merge the release branch back into the appropriate branches.
|
||||||
|
All branches will be automatically pulled from the remote and the results
|
||||||
|
will be pushed to the remote."""
|
||||||
|
|
||||||
|
synapse_repo = get_repo_and_check_clean_checkout()
|
||||||
|
branch_name = synapse_repo.active_branch.name
|
||||||
|
|
||||||
|
if not branch_name.startswith("release-v"):
|
||||||
|
raise RuntimeError("Not on a release branch. This does not seem sensible.")
|
||||||
|
|
||||||
|
# Pull so we're up to date
|
||||||
|
synapse_repo.remote().pull()
|
||||||
|
|
||||||
|
current_version = get_package_version()
|
||||||
|
|
||||||
|
if current_version.is_prerelease:
|
||||||
|
# Release candidate
|
||||||
|
if click.confirm(f"Merge {branch_name} → develop?", default=True):
|
||||||
|
_merge_into(synapse_repo, branch_name, "develop")
|
||||||
|
else:
|
||||||
|
# Full release
|
||||||
|
sytest_repo = get_repo_and_check_clean_checkout("../sytest", "sytest")
|
||||||
|
|
||||||
|
if click.confirm(f"Merge {branch_name} → master?", default=True):
|
||||||
|
_merge_into(synapse_repo, branch_name, "master")
|
||||||
|
|
||||||
|
if click.confirm("Merge master → develop?", default=True):
|
||||||
|
_merge_into(synapse_repo, "master", "develop")
|
||||||
|
|
||||||
|
if click.confirm(f"On SyTest, merge {branch_name} → master?", default=True):
|
||||||
|
_merge_into(sytest_repo, branch_name, "master")
|
||||||
|
|
||||||
|
if click.confirm("On SyTest, merge master → develop?", default=True):
|
||||||
|
_merge_into(sytest_repo, "master", "develop")
|
||||||
|
|
||||||
|
|
||||||
@cli.command()
|
@cli.command()
|
||||||
def announce() -> None:
|
def announce() -> None:
|
||||||
"""Generate markdown to announce the release."""
|
"""Generate markdown to announce the release."""
|
||||||
|
Loading…
Reference in New Issue
Block a user