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.

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

Use ci_matching_branch/ in bump_dependency.bash #580

Merged
merged 4 commits into from
Dec 3, 2021

Conversation

scpeters
Copy link
Contributor

@scpeters scpeters commented Dec 3, 2021

This updates the bump_dependency.bash script to prefix branch names with ci_matching_branch/ so that CI should automatically use the matching branch in infrastructure repositories. I'm using this branch with #554, and branch matching currently works for homebrew-simulation, so I would expect the homebrew builds to work properly.

The following changes support the matching branch names:

  • 861c022: use consistent branch names with ci_matching_branch/ prefix
  • 7a0f736: fix sanity check of branch names, which was hard-coded to expect that the names start with bump_

The following fixes a bug in fuel-tools branch name replacement:

  • efce3f6: reorder the - for _ substitution in the search/replace for collection repositories since it didn't replace ign-fuel-tools8 with main properly

I've also re-ordered the pull requests so that metadata pull requests should be opened first. I think the CI jobs will be more likely to pass with this approach.

Part of #564.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Replace branch name before swapping - for _ in DEP_LIB.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
The source code PRs will fail without the metadata,
so commit the metadata first.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters requested a review from chapulina December 3, 2021 18:11
@scpeters scpeters requested a review from j-rivero as a code owner December 3, 2021 18:11
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

Nice! 👍

@scpeters scpeters merged commit 670d76f into master Dec 3, 2021
@scpeters scpeters deleted the scpeters/bump_dep_matching_branch branch December 3, 2021 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants