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

Merge: 7 -> 8 #2175

Merged
merged 5 commits into from
Sep 27, 2023
Merged

Merge: 7 -> 8 #2175

merged 5 commits into from
Sep 27, 2023

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Sep 27, 2023

➡️ Forward port

Port gz-sim7 to gz-sim8

Branch comparison: gz-sim8...gz-sim7

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

iche033 and others added 4 commits September 20, 2023 18:41
* Fix reset button in examples (#2151)

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

* fix reset button in more world sdf files

Signed-off-by: Ian Chen <ichen@openrobotics.org>

---------

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Sep 27, 2023
@azeey azeey added the beta Targeting beta release of upcoming collection label Sep 27, 2023
@azeey
Copy link
Contributor

azeey commented Sep 27, 2023

SdfGeneratorFixture.ModelWithNestedIncludes is failing I think because one of the Fuel models got updated.

…des test

Signed-off-by: Ian Chen <ichen@openrobotics.org>
@iche033
Copy link
Contributor Author

iche033 commented Sep 27, 2023

should be fixed in 409d8c5

@codecov
Copy link

codecov bot commented Sep 27, 2023

Codecov Report

Merging #2175 (1b96c70) into gz-sim8 (e603694) will decrease coverage by 0.01%.
The diff coverage is n/a.

❗ Current head 1b96c70 differs from pull request most recent head 409d8c5. Consider uploading reports for the commit 409d8c5 to get more accurate results

@@             Coverage Diff             @@
##           gz-sim8    #2175      +/-   ##
===========================================
- Coverage    65.47%   65.47%   -0.01%     
===========================================
  Files          323      323              
  Lines        30711    30710       -1     
===========================================
- Hits         20108    20107       -1     
  Misses       10603    10603              

see 2 files with indirect coverage changes

@iche033 iche033 merged commit 4c62304 into gz-sim8 Sep 27, 2023
@iche033 iche033 deleted the merge_7_8_20230927 branch September 27, 2023 22:45
@scpeters scpeters mentioned this pull request Oct 8, 2023
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta Targeting beta release of upcoming collection 🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants