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

Merge ign-transport8 ➡️ ign-transport11 #333

Merged
merged 4 commits into from
Jul 23, 2022
Merged

Merge ign-transport8 ➡️ ign-transport11 #333

merged 4 commits into from
Jul 23, 2022

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-transport8 ➡️ ign-transport11

Branch comparision: ign-transport11...ign-transport8

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

mabelzhang and others added 3 commits June 14, 2022 16:34
@mabelzhang @chapulina
Bash completion for flags (#312)
30da9d3 
Signed-off-by: Mabel Zhang <mabel@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
@jennuine
Ignition -> Gazebo (#330)
0be3a49 
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
@chapulina
8 ➡️ 11
c3ac30a 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina requested a review from caguero as a code owner July 20, 2022 18:13
@chapulina chapulina requested a review from jennuine July 20, 2022 18:14
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Jul 20, 2022
ahcorde
ahcorde requested changes Jul 20, 2022
View reviewed changes
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

this is not compiling

  /github/workspace/src/cmd/ign_TEST.cc: In member function 'virtual void ignTest_ServiceHelpVsCompletionFlags_Test::TestBody()':
  /github/workspace/src/cmd/ign_TEST.cc:472:38: error: 'PROJECT_SOURCE_DIR' was not declared in this scope
     std::filesystem::path scriptPath = PROJECT_SOURCE_DIR;

@jennuine
fix bash completion for Fortress (#333)
c0c54bb 
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
@jennuine
Copy link
Contributor

this is not compiling

  /github/workspace/src/cmd/ign_TEST.cc: In member function 'virtual void ignTest_ServiceHelpVsCompletionFlags_Test::TestBody()':
  /github/workspace/src/cmd/ign_TEST.cc:472:38: error: 'PROJECT_SOURCE_DIR' was not declared in this scope
     std::filesystem::path scriptPath = PROJECT_SOURCE_DIR;

Should be fixed here: c0c54bb

@mabelzhang can you double check the updates I did were correct? I saw a couple TODOs in the transport.bash_completion.sh file

@mabelzhang
Copy link
Contributor

mabelzhang commented Jul 21, 2022 •
edited
Loading

Your updates look good to me. (and UNIT_ign_TEST is passing on CI, that's how you know you did the TODOs right :D) Thanks!

@chapulina
Copy link
Contributor Author

The new UNIT_Discovery_TEST failure isn't caused by this PR and is being investigated on #335

@chapulina chapulina merged commit 8191ef3 into ign-transport11 Jul 23, 2022
@chapulina chapulina deleted the chapulina/8_to_11 branch July 23, 2022 05:02
@azeey azeey mentioned this pull request Aug 5, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde requested changes

@caguero caguero Awaiting requested review from caguero caguero is a code owner

@jennuine jennuine Awaiting requested review from jennuine

Assignees
No one assigned
Labels
🏯 fortress Ignition Fortress
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@chapulina @jennuine @mabelzhang @ahcorde