Skip to content
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

Jump to bottom

Change to the 'master' branch when syncing tracks.yaml branches. #37159

Merged
merged 1 commit into from
May 9, 2023
Merged

Change to the 'master' branch when syncing tracks.yaml branches. #37159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions scripts/sync-ros2-gbp-devel-branch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ def main():

with tempfile.TemporaryDirectory() as tmpdirname:
gitrepo = git.Repo.clone_from(release_url, tmpdirname)
gitrepo.git.checkout('master')
branch = gitrepo.create_head(branch_name)
branch.checkout()
with open(os.path.join(tmpdirname, 'tracks.yaml'), 'r') as infp:
Expand All @@ -232,8 +233,8 @@ def main():
try:
gitrepo.git.push('--set-upstream', gitrepo.remote(), gitrepo.head.ref)
except git.exc.GitCommandError:
print('Could not push to release repo for {ros_distro}: {reponame}, skipping...'.format(ros_distro=ros_distro, reponame=tracks_yaml_distro['name']))
continue
print('Could not push to release repo for {ros_distro}: {reponame}, skipping...'.format(ros_distro=ros_distro, reponame=tracks_yaml_distro['name']))
continue

gh_title = 'Update {ros_distro} devel_branch to match rosdistro source entry'.format(ros_distro=ros_distro)
gh_repo = gh.get_repo(release_end)
Expand Down