Skip to content

misc: fallback to base branch in ci.py set-branch #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 2, 2025
Merged

misc: fallback to base branch in ci.py set-branch #81

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a28af9
Fallback to base branch in `ci.py set-branch`
lauzadis Apr 2, 2025
985b365
Fix print statements
lauzadis Apr 2, 2025
dd4e483
Remove another unnecessary `$`
lauzadis Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions scripts/ci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ def has_remote_branch(repo_dir, branch_name):

def update_repo(repo_dir, branch_name):
"""
Attempt to update the repository to the given branch name
Attempt to update the repository to the given branch name, if it exists.
Otherwise tries the branch name set by `GITHUB_BASE_REF`, if it exists.
"""
branch_name = branch_name.removeprefix(GIT_ORIGIN_REFIX)
curr_branch = get_current_branch(repo_dir)
Expand All @@ -69,14 +70,18 @@ def update_repo(repo_dir, branch_name):
vprint("branches match already, nothing to do")
return

has_branch = has_remote_branch(repo_dir, branch_name)
if has_branch:
base_branch = os.environ.get("GITHUB_BASE_REF")

if has_remote_branch(repo_dir, branch_name):
vprint(f"repo has target branch `{branch_name}`: {has_branch}...updating")
Copy link
Contributor

@ianbotsf ianbotsf Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: This vprint still references the now-nonexistent has_branch variable.

pout = shell(f"git switch {branch_name}", cwd=repo_dir)
vprint(pout.stdout.decode("utf-8"))
elif (base_branch != curr_branch) and has_remote_branch(repo_dir, base_branch):
vprint(f"repo does not have target branch ${branch_name}, but has base branch {base_branch}...updating")
pout = shell(f"git switch {base_branch}", cwd=repo_dir)
vprint(pout.stdout.decode("utf-8"))
else:
vprint(f"repo does not have target branch `{branch_name}`, leaving at {curr_branch}")

vprint(f"repo does not have target branch {branch_name} nor base_branch ${base_branch}, leaving at {curr_branch}")
Copy link
Contributor

@ianbotsf ianbotsf Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Unnecessary $

Copy link
Member Author

@lauzadis lauzadis Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kotlin brain


def _get_branch_cmd(opts):
branch = "main"
Expand Down