diff --git a/scripts/make-release.py b/scripts/make-release.py index 304bafd93..7d7c9cb51 100644 --- a/scripts/make-release.py +++ b/scripts/make-release.py @@ -276,7 +276,7 @@ def make_release(version): if proc.returncode != 0: for line in proc.stdout: print(line.rstrip()) - raise Exception("could not commit checkout master " + RELEASE_VERSION_WITH_V) + raise Exception("could not commit checkout main " + RELEASE_VERSION_WITH_V) if not(already_released): proc = subprocess.Popen(['gh','pr', "merge", "--auto", pr_number, "--merge", "--delete-branch"], stdout = subprocess.PIPE, cwd = temp_dir.name) @@ -285,8 +285,8 @@ def make_release(version): # wait for bors to merge PR while not(already_released): - print("git pull origin master...") - proc = subprocess.Popen(['git','pull', "origin", "master", "--depth", "1"], stdout = subprocess.PIPE, cwd = temp_dir.name) + print("git pull origin main...") + proc = subprocess.Popen(['git','pull', "origin", "main", "--depth", "1"], stdout = subprocess.PIPE, cwd = temp_dir.name) proc.wait() if proc.returncode != 0: for line in proc.stdout: @@ -313,7 +313,7 @@ def make_release(version): current_commit = line break else: - raise Exception("could not git log master") + raise Exception("could not git log main") if current_commit == "": raise Exception("could not get current info")