GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit a37f39ae authored by Georg Koppen's avatar Georg Koppen

Merge branch 'maint-1.1' into master

parents 112f7f7d 4bed2ce6
Pipeline #901 passed with stage
in 36 minutes and 20 seconds
......@@ -36,7 +36,6 @@ It assumes that:
https://github.com/GitTools/GitVersion
"""
import re
import subprocess
import sys
try:
......@@ -125,7 +124,7 @@ def main(args):
print("-------------------------------")
print("Obtaining Gitlab tarball...")
subprocess.call(
"wget https://gitlab.torproject.org/tpo/network-health/sbws/-/archive/v{}/sbws-v{}.tar.gz "
"wget https://gitlab.torproject.org/tpo/network-health/sbws/-/archive/v{}/sbws-v{}.tar.gz " # noqa
"-O v{}.tar.gz"
.format(release_version, release_version, release_version).split(' ')
)
......@@ -151,8 +150,8 @@ def main(args):
"git merge --no-ff mybranch"
"git push myremote master")
next_branch_version = "maint{}".format(release_version)
print("And create the next prerelease branch, eg:")
"git checkout -b {}".format(next_branch_version)
print("And create the next prerelease branch, eg:"
"git checkout -b {}".format(next_branch_version))
if __name__ == "__main__":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment