switch to main

This commit is contained in:
M.Amin Rayej
2024-05-08 18:30:02 +03:30
parent 5cd06f39b5
commit 0fcb41a9cb

View File

@ -276,7 +276,7 @@ def make_release(version):
if proc.returncode != 0: if proc.returncode != 0:
for line in proc.stdout: for line in proc.stdout:
print(line.rstrip()) 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): if not(already_released):
proc = subprocess.Popen(['gh','pr', "merge", "--auto", pr_number, "--merge", "--delete-branch"], stdout = subprocess.PIPE, cwd = temp_dir.name) 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 # wait for bors to merge PR
while not(already_released): while not(already_released):
print("git pull origin master...") print("git pull origin main...")
proc = subprocess.Popen(['git','pull', "origin", "master", "--depth", "1"], stdout = subprocess.PIPE, cwd = temp_dir.name) proc = subprocess.Popen(['git','pull', "origin", "main", "--depth", "1"], stdout = subprocess.PIPE, cwd = temp_dir.name)
proc.wait() proc.wait()
if proc.returncode != 0: if proc.returncode != 0:
for line in proc.stdout: for line in proc.stdout:
@ -313,7 +313,7 @@ def make_release(version):
current_commit = line current_commit = line
break break
else: else:
raise Exception("could not git log master") raise Exception("could not git log main")
if current_commit == "": if current_commit == "":
raise Exception("could not get current info") raise Exception("could not get current info")