mirror of
https://github.com/element-hq/synapse.git
synced 2024-11-23 18:15:53 +03:00
Make the release script create a release branch for Complement as well (#17318)
Some checks are pending
Build docker images / build (push) Waiting to run
Deploy the documentation / Calculate variables for GitHub Pages deployment (push) Waiting to run
Deploy the documentation / GitHub Pages (push) Blocked by required conditions
Build release artifacts / Calculate list of debian distros (push) Waiting to run
Build release artifacts / Build .deb packages (push) Blocked by required conditions
Build release artifacts / Build wheels on ${{ matrix.os }} for ${{ matrix.arch }} (aarch64, ${{ startsWith(github.ref, 'refs/pull/') }}, ubuntu-20.04) (push) Waiting to run
Build release artifacts / Build wheels on ${{ matrix.os }} for ${{ matrix.arch }} (x86_64, ${{ startsWith(github.ref, 'refs/pull/') }}, macos-12) (push) Waiting to run
Build release artifacts / Build wheels on ${{ matrix.os }} for ${{ matrix.arch }} (x86_64, ${{ startsWith(github.ref, 'refs/pull/') }}, ubuntu-20.04) (push) Waiting to run
Build release artifacts / Build sdist (push) Waiting to run
Build release artifacts / Attach assets to release (push) Blocked by required conditions
Tests / changes (push) Waiting to run
Tests / check-sampleconfig (push) Blocked by required conditions
Tests / check-schema-delta (push) Blocked by required conditions
Tests / check-lockfile (push) Waiting to run
Tests / lint (push) Blocked by required conditions
Tests / Typechecking (push) Blocked by required conditions
Tests / lint-crlf (push) Waiting to run
Tests / lint-newsfile (push) Waiting to run
Tests / lint-pydantic (push) Blocked by required conditions
Tests / lint-clippy (push) Blocked by required conditions
Tests / lint-clippy-nightly (push) Blocked by required conditions
Tests / lint-rustfmt (push) Blocked by required conditions
Tests / lint-readme (push) Blocked by required conditions
Tests / linting-done (push) Blocked by required conditions
Tests / calculate-test-jobs (push) Blocked by required conditions
Tests / trial (push) Blocked by required conditions
Tests / trial-olddeps (push) Blocked by required conditions
Tests / trial-pypy (all, pypy-3.8) (push) Blocked by required conditions
Tests / sytest (push) Blocked by required conditions
Tests / export-data (push) Blocked by required conditions
Tests / portdb (11, 3.8) (push) Blocked by required conditions
Tests / portdb (15, 3.11) (push) Blocked by required conditions
Tests / complement (monolith, Postgres) (push) Blocked by required conditions
Tests / complement (monolith, SQLite) (push) Blocked by required conditions
Tests / complement (workers, Postgres) (push) Blocked by required conditions
Tests / cargo-test (push) Blocked by required conditions
Tests / cargo-bench (push) Blocked by required conditions
Tests / tests-done (push) Blocked by required conditions
Some checks are pending
Build docker images / build (push) Waiting to run
Deploy the documentation / Calculate variables for GitHub Pages deployment (push) Waiting to run
Deploy the documentation / GitHub Pages (push) Blocked by required conditions
Build release artifacts / Calculate list of debian distros (push) Waiting to run
Build release artifacts / Build .deb packages (push) Blocked by required conditions
Build release artifacts / Build wheels on ${{ matrix.os }} for ${{ matrix.arch }} (aarch64, ${{ startsWith(github.ref, 'refs/pull/') }}, ubuntu-20.04) (push) Waiting to run
Build release artifacts / Build wheels on ${{ matrix.os }} for ${{ matrix.arch }} (x86_64, ${{ startsWith(github.ref, 'refs/pull/') }}, macos-12) (push) Waiting to run
Build release artifacts / Build wheels on ${{ matrix.os }} for ${{ matrix.arch }} (x86_64, ${{ startsWith(github.ref, 'refs/pull/') }}, ubuntu-20.04) (push) Waiting to run
Build release artifacts / Build sdist (push) Waiting to run
Build release artifacts / Attach assets to release (push) Blocked by required conditions
Tests / changes (push) Waiting to run
Tests / check-sampleconfig (push) Blocked by required conditions
Tests / check-schema-delta (push) Blocked by required conditions
Tests / check-lockfile (push) Waiting to run
Tests / lint (push) Blocked by required conditions
Tests / Typechecking (push) Blocked by required conditions
Tests / lint-crlf (push) Waiting to run
Tests / lint-newsfile (push) Waiting to run
Tests / lint-pydantic (push) Blocked by required conditions
Tests / lint-clippy (push) Blocked by required conditions
Tests / lint-clippy-nightly (push) Blocked by required conditions
Tests / lint-rustfmt (push) Blocked by required conditions
Tests / lint-readme (push) Blocked by required conditions
Tests / linting-done (push) Blocked by required conditions
Tests / calculate-test-jobs (push) Blocked by required conditions
Tests / trial (push) Blocked by required conditions
Tests / trial-olddeps (push) Blocked by required conditions
Tests / trial-pypy (all, pypy-3.8) (push) Blocked by required conditions
Tests / sytest (push) Blocked by required conditions
Tests / export-data (push) Blocked by required conditions
Tests / portdb (11, 3.8) (push) Blocked by required conditions
Tests / portdb (15, 3.11) (push) Blocked by required conditions
Tests / complement (monolith, Postgres) (push) Blocked by required conditions
Tests / complement (monolith, SQLite) (push) Blocked by required conditions
Tests / complement (workers, Postgres) (push) Blocked by required conditions
Tests / cargo-test (push) Blocked by required conditions
Tests / cargo-bench (push) Blocked by required conditions
Tests / tests-done (push) Blocked by required conditions
This commit is contained in:
parent
22aeb78b77
commit
7786ae7e1c
2 changed files with 25 additions and 1 deletions
1
changelog.d/17318.misc
Normal file
1
changelog.d/17318.misc
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Make the release script create a release branch for Complement as well.
|
|
@ -70,6 +70,7 @@ def cli() -> None:
|
||||||
pip install -e .[dev]
|
pip install -e .[dev]
|
||||||
|
|
||||||
- A checkout of the sytest repository at ../sytest
|
- A checkout of the sytest repository at ../sytest
|
||||||
|
- A checkout of the complement repository at ../complement
|
||||||
|
|
||||||
Then to use:
|
Then to use:
|
||||||
|
|
||||||
|
@ -112,10 +113,12 @@ def _prepare() -> None:
|
||||||
# Make sure we're in a git repo.
|
# Make sure we're in a git repo.
|
||||||
synapse_repo = get_repo_and_check_clean_checkout()
|
synapse_repo = get_repo_and_check_clean_checkout()
|
||||||
sytest_repo = get_repo_and_check_clean_checkout("../sytest", "sytest")
|
sytest_repo = get_repo_and_check_clean_checkout("../sytest", "sytest")
|
||||||
|
complement_repo = get_repo_and_check_clean_checkout("../complement", "complement")
|
||||||
|
|
||||||
click.secho("Updating Synapse and Sytest git repos...")
|
click.secho("Updating Synapse and Sytest git repos...")
|
||||||
synapse_repo.remote().fetch()
|
synapse_repo.remote().fetch()
|
||||||
sytest_repo.remote().fetch()
|
sytest_repo.remote().fetch()
|
||||||
|
complement_repo.remote().fetch()
|
||||||
|
|
||||||
# Get the current version and AST from root Synapse module.
|
# Get the current version and AST from root Synapse module.
|
||||||
current_version = get_package_version()
|
current_version = get_package_version()
|
||||||
|
@ -208,7 +211,15 @@ def _prepare() -> None:
|
||||||
"Which branch should the release be based on?", default=default
|
"Which branch should the release be based on?", default=default
|
||||||
)
|
)
|
||||||
|
|
||||||
for repo_name, repo in {"synapse": synapse_repo, "sytest": sytest_repo}.items():
|
for repo_name, repo in {
|
||||||
|
"synapse": synapse_repo,
|
||||||
|
"sytest": sytest_repo,
|
||||||
|
"complement": complement_repo,
|
||||||
|
}.items():
|
||||||
|
# Special case for Complement: `develop` maps to `main`
|
||||||
|
if repo_name == "complement" and branch_name == "develop":
|
||||||
|
branch_name = "main"
|
||||||
|
|
||||||
base_branch = find_ref(repo, branch_name)
|
base_branch = find_ref(repo, branch_name)
|
||||||
if not base_branch:
|
if not base_branch:
|
||||||
print(f"Could not find base branch {branch_name} for {repo_name}!")
|
print(f"Could not find base branch {branch_name} for {repo_name}!")
|
||||||
|
@ -231,6 +242,12 @@ def _prepare() -> None:
|
||||||
if click.confirm("Push new SyTest branch?", default=True):
|
if click.confirm("Push new SyTest branch?", default=True):
|
||||||
sytest_repo.git.push("-u", sytest_repo.remote().name, release_branch_name)
|
sytest_repo.git.push("-u", sytest_repo.remote().name, release_branch_name)
|
||||||
|
|
||||||
|
# Same for Complement
|
||||||
|
if click.confirm("Push new Complement branch?", default=True):
|
||||||
|
complement_repo.git.push(
|
||||||
|
"-u", complement_repo.remote().name, release_branch_name
|
||||||
|
)
|
||||||
|
|
||||||
# Switch to the release branch and ensure it's up to date.
|
# Switch to the release branch and ensure it's up to date.
|
||||||
synapse_repo.git.checkout(release_branch_name)
|
synapse_repo.git.checkout(release_branch_name)
|
||||||
update_branch(synapse_repo)
|
update_branch(synapse_repo)
|
||||||
|
@ -630,6 +647,9 @@ def _merge_back() -> None:
|
||||||
else:
|
else:
|
||||||
# Full release
|
# Full release
|
||||||
sytest_repo = get_repo_and_check_clean_checkout("../sytest", "sytest")
|
sytest_repo = get_repo_and_check_clean_checkout("../sytest", "sytest")
|
||||||
|
complement_repo = get_repo_and_check_clean_checkout(
|
||||||
|
"../complement", "complement"
|
||||||
|
)
|
||||||
|
|
||||||
if click.confirm(f"Merge {branch_name} → master?", default=True):
|
if click.confirm(f"Merge {branch_name} → master?", default=True):
|
||||||
_merge_into(synapse_repo, branch_name, "master")
|
_merge_into(synapse_repo, branch_name, "master")
|
||||||
|
@ -643,6 +663,9 @@ def _merge_back() -> None:
|
||||||
if click.confirm("On SyTest, merge master → develop?", default=True):
|
if click.confirm("On SyTest, merge master → develop?", default=True):
|
||||||
_merge_into(sytest_repo, "master", "develop")
|
_merge_into(sytest_repo, "master", "develop")
|
||||||
|
|
||||||
|
if click.confirm(f"On Complement, merge {branch_name} → main?", default=True):
|
||||||
|
_merge_into(complement_repo, branch_name, "main")
|
||||||
|
|
||||||
|
|
||||||
@cli.command()
|
@cli.command()
|
||||||
def announce() -> None:
|
def announce() -> None:
|
||||||
|
|
Loading…
Reference in a new issue