Skip to content
Snippets Groups Projects
Commit dfcb822e authored by Patrick Cloke's avatar Patrick Cloke Committed by Erik Johnston
Browse files

Update repo for release scripts.

parent 188a51da
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
package = "synapse" package = "synapse"
filename = "CHANGES.md" filename = "CHANGES.md"
directory = "changelog.d" directory = "changelog.d"
issue_format = "[\\#{issue}](https://github.com/matrix-org/synapse/issues/{issue})" issue_format = "[\\#{issue}](https://github.com/element-hq/synapse/issues/{issue})"
[[tool.towncrier.type]] [[tool.towncrier.type]]
directory = "feature" directory = "feature"
...@@ -101,7 +101,7 @@ description = "Homeserver for the Matrix decentralised comms protocol" ...@@ -101,7 +101,7 @@ description = "Homeserver for the Matrix decentralised comms protocol"
authors = ["Matrix.org Team and Contributors <packages@matrix.org>"] authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"
readme = "README.rst" readme = "README.rst"
repository = "https://github.com/matrix-org/synapse" repository = "https://github.com/element-hq/synapse"
packages = [ packages = [
{ include = "synapse" }, { include = "synapse" },
] ]
......
...@@ -293,7 +293,7 @@ def _prepare() -> None: ...@@ -293,7 +293,7 @@ def _prepare() -> None:
print("Opening the changelog in your browser...") print("Opening the changelog in your browser...")
print("Please ask #synapse-dev to give it a check.") print("Please ask #synapse-dev to give it a check.")
click.launch( click.launch(
f"https://github.com/matrix-org/synapse/blob/{synapse_repo.active_branch.name}/CHANGES.md" f"https://github.com/element.-hq/synapse/blob/{synapse_repo.active_branch.name}/CHANGES.md"
) )
...@@ -361,18 +361,18 @@ def _tag(gh_token: Optional[str]) -> None: ...@@ -361,18 +361,18 @@ def _tag(gh_token: Optional[str]) -> None:
print("As this is an RC, remember to mark it as a pre-release!") print("As this is an RC, remember to mark it as a pre-release!")
print("(by the way, this step can be automated by passing --gh-token,") print("(by the way, this step can be automated by passing --gh-token,")
print("or one of the GH_TOKEN or GITHUB_TOKEN env vars.)") print("or one of the GH_TOKEN or GITHUB_TOKEN env vars.)")
click.launch(f"https://github.com/matrix-org/synapse/releases/edit/{tag_name}") click.launch(f"https://github.com/element.-hq/synapse/releases/edit/{tag_name}")
print("Once done, you need to wait for the release assets to build.") print("Once done, you need to wait for the release assets to build.")
if click.confirm("Launch the release assets actions page?", default=True): if click.confirm("Launch the release assets actions page?", default=True):
click.launch( click.launch(
f"https://github.com/matrix-org/synapse/actions?query=branch%3A{tag_name}" f"https://github.com/element.-hq/synapse/actions?query=branch%3A{tag_name}"
) )
return return
# Create a new draft release # Create a new draft release
gh = Github(gh_token) gh = Github(gh_token)
gh_repo = gh.get_repo("matrix-org/synapse") gh_repo = gh.get_repo("element.-hq/synapse")
release = gh_repo.create_git_release( release = gh_repo.create_git_release(
tag=tag_name, tag=tag_name,
name=tag_name, name=tag_name,
...@@ -385,7 +385,7 @@ def _tag(gh_token: Optional[str]) -> None: ...@@ -385,7 +385,7 @@ def _tag(gh_token: Optional[str]) -> None:
print("Launching the release page and the actions page.") print("Launching the release page and the actions page.")
click.launch(release.html_url) click.launch(release.html_url)
click.launch( click.launch(
f"https://github.com/matrix-org/synapse/actions?query=branch%3A{tag_name}" f"https://github.com/element.-hq/synapse/actions?query=branch%3A{tag_name}"
) )
click.echo("Wait for release assets to be built") click.echo("Wait for release assets to be built")
...@@ -411,7 +411,7 @@ def _publish(gh_token: str) -> None: ...@@ -411,7 +411,7 @@ def _publish(gh_token: str) -> None:
# Publish the draft release # Publish the draft release
gh = Github(gh_token) gh = Github(gh_token)
gh_repo = gh.get_repo("matrix-org/synapse") gh_repo = gh.get_repo("element.-hq/synapse")
for release in gh_repo.get_releases(): for release in gh_repo.get_releases():
if release.title == tag_name: if release.title == tag_name:
break break
...@@ -454,7 +454,7 @@ def _upload(gh_token: Optional[str]) -> None: ...@@ -454,7 +454,7 @@ def _upload(gh_token: Optional[str]) -> None:
# Query all the assets corresponding to this release. # Query all the assets corresponding to this release.
gh = Github(gh_token) gh = Github(gh_token)
gh_repo = gh.get_repo("matrix-org/synapse") gh_repo = gh.get_repo("element.-hq/synapse")
gh_release = gh_repo.get_release(tag_name) gh_release = gh_repo.get_release(tag_name)
all_assets = set(gh_release.get_assets()) all_assets = set(gh_release.get_assets())
...@@ -543,7 +543,9 @@ def _wait_for_actions(gh_token: Optional[str]) -> None: ...@@ -543,7 +543,9 @@ def _wait_for_actions(gh_token: Optional[str]) -> None:
# Authentication is optional on this endpoint, # Authentication is optional on this endpoint,
# but use a token if we have one to reduce the chance of being rate-limited. # but use a token if we have one to reduce the chance of being rate-limited.
url = f"https://api.github.com/repos/matrix-org/synapse/actions/runs?branch={tag_name}" url = (
f"https://api.github.com/repos/element.-hq/synapse/actions/runs?branch={tag_name}"
)
headers = {"Accept": "application/vnd.github+json"} headers = {"Accept": "application/vnd.github+json"}
if gh_token is not None: if gh_token is not None:
headers["authorization"] = f"token {gh_token}" headers["authorization"] = f"token {gh_token}"
...@@ -658,8 +660,8 @@ def _announce() -> None: ...@@ -658,8 +660,8 @@ def _announce() -> None:
f""" f"""
Hi everyone. Synapse {current_version} has just been released. Hi everyone. Synapse {current_version} has just been released.
[notes](https://github.com/matrix-org/synapse/releases/tag/{tag_name}) | \ [notes](https://github.com/element.-hq/synapse/releases/tag/{tag_name}) | \
[docker](https://hub.docker.com/r/matrixdotorg/synapse/tags?name={tag_name}) | \ [docker](https://hub.docker.com/r/vectorim/synapse/tags?name={tag_name}) | \
[debs](https://packages.matrix.org/debian/) | \ [debs](https://packages.matrix.org/debian/) | \
[pypi](https://pypi.org/project/matrix-synapse/{current_version}/)""" [pypi](https://pypi.org/project/matrix-synapse/{current_version}/)"""
) )
...@@ -689,7 +691,7 @@ Ask the designated people to do the blog and tweets.""" ...@@ -689,7 +691,7 @@ Ask the designated people to do the blog and tweets."""
def full(gh_token: str) -> None: def full(gh_token: str) -> None:
click.echo("1. If this is a security release, read the security wiki page.") click.echo("1. If this is a security release, read the security wiki page.")
click.echo("2. Check for any release blockers before proceeding.") click.echo("2. Check for any release blockers before proceeding.")
click.echo(" https://github.com/matrix-org/synapse/labels/X-Release-Blocker") click.echo(" https://github.com/element.-hq/synapse/labels/X-Release-Blocker")
click.echo( click.echo(
"3. Check for any other special release notes, including announcements to add to the changelog or special deployment instructions." "3. Check for any other special release notes, including announcements to add to the changelog or special deployment instructions."
) )
...@@ -893,7 +895,7 @@ def build_dependabot_changelog(repo: Repo, current_version: version.Version) -> ...@@ -893,7 +895,7 @@ def build_dependabot_changelog(repo: Repo, current_version: version.Version) ->
def replacer(match: Match[str]) -> str: def replacer(match: Match[str]) -> str:
desc = match.group(1) desc = match.group(1)
number = match.group(2) number = match.group(2)
return f"* {desc}. ([\\#{number}](https://github.com/matrix-org/synapse/issues/{number}))" return f"* {desc}. ([\\#{number}](https://github.com/element.-hq/synapse/issues/{number}))"
for i, message in enumerate(messages): for i, message in enumerate(messages):
messages[i] = re.sub(r"(.*) \(#(\d+)\)$", replacer, message) messages[i] = re.sub(r"(.*) \(#(\d+)\)$", replacer, message)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment