Merge 6 -> 7 #2477
Merged
Merge 6 -> 7 #2477
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
iche033
force-pushed
the
merge_6_7_20240712
branch
from
b0b21dc to
e629a46
Compare
Signed-off-by: Ian Chen <[email protected]>
iche033
force-pushed
the
merge_6_7_20240712
branch
from
e629a46 to
aadc7a6
Compare
azeey
approved these changes
Jul 12, 2024
There was a problem hiding this comment.
Looks like there are some CI failures on GitHub actions. I think what's going on is that these tests weren't enabled before since Xvfb was running after cmake. With the changes in this PR, these tests are now active but seem to fail on Github Actions. Since it's probably GPU related, I would propose we disable them in a follow-up PR by checking for the GITHUB_ACTIONS environment variable (see
gz-sim/src/gui/Gui_clean_exit_TEST.cc
Line 87 in 90a7ba7
8 tasks
|
Created a follow up PR in #2480 to disable these tests. Checking to make sure CI is green first before merging these two PRs. |
Signed-off-by: Ian Chen <[email protected]>
mjcarroll
approved these changes
Jul 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
➡️ Forward port
Port ign-gazebo6 to gz-sim7
Branch comparison: ign-gazebo6...gz-sim7
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)