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

generators: add --no-branch option to prevent creating new local branch (#248) #249

Merged
merged 1 commit into from
Dec 3, 2019

Conversation

shr-project
Copy link
Contributor

  • useful when regenerating the files locally by hand without planing to submit
    PR with the changes or when some other tool will do additional
    integration before doing the PR (like we plan to do with meta-ros)

Signed-off-by: Martin Jansa martin.jansa@lge.com

@@ -93,7 +93,8 @@ def main():
overlay = RosMeta(
_repo,
not args.output_repository_path,
branch='superflore/{}'.format(now),
branch=(('superflore/{}'.format(now)) if not args.no_branch
else None),
Copy link
Collaborator

Choose a reason for hiding this comment

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

@shr-project the linter is unhappy with this line

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looking into it now (before the line was too long now this.. :))

Copy link
Collaborator

Choose a reason for hiding this comment

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

before the line was too long now this.. :)

Haha, yeah. Welcome to superflore changes ;). Linter is pretty picky.

@shr-project
Copy link
Contributor Author

Fixes #248

@shr-project
Copy link
Contributor Author

Hi @allenh1 is there anything blocking this PR? We're almost ready to publish updated meta-ros with recipes generated with superflore modified with all these open PRs and it would be nice to have it in superflore/master before we do.

superflore/parser.py Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
Copy link
Collaborator

@allenh1 allenh1 left a comment

Choose a reason for hiding this comment

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

Some small changes, but nothing major.

* useful when regenerating the files locally by hand without planing to submit
  PR with the changes or when some other tool will do additional
  integration before doing the PR (like we plan to do with meta-ros)

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Copy link
Collaborator

@allenh1 allenh1 left a comment

Choose a reason for hiding this comment

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

@shr-project Thanks!

Looks good.

@allenh1 allenh1 merged commit 7940380 into ros-infrastructure:master Dec 3, 2019
@shr-project shr-project deleted the jansa/no-branch branch December 3, 2019 16:13
zffgithub pushed a commit to zffgithub/superflore that referenced this pull request Apr 11, 2023
…ch (ros-infrastructure#249)

* useful when regenerating the files locally by hand without planing to submit
  PR with the changes or when some other tool will do additional
  integration before doing the PR (like we plan to do with meta-ros)

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
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.

None yet

2 participants