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

3 ➡️ 4 #185

Merged
merged 7 commits into from
Mar 19, 2021
Merged

3 ➡️ 4 #185

merged 7 commits into from
Mar 19, 2021

Conversation

chapulina
Copy link
Contributor

@chapulina chapulina commented Mar 12, 2021 •
edited by adlarkin
Loading

➡️ Forward port

Port ign-common3 to main

Branch comparison: main...ign-common3

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

🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸

chapulina added 5 commits March 8, 2021 10:42
@chapulina
🎈 3.11.0 (#178)
38c0d0c 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Relax expectation so encoder test passes on ARM (#183)
0bddf0f 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Revert "Associate library materials effect with meshes (#151)" (#182)
a475998 
This reverts commit 89b1157.

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
🎈 3.11.1 (#184)
58dd2a1 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Master branch updates (#179)
031670f 
Part of gazebo-tooling/release-tools#416

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina requested a review from mjcarroll as a code owner March 12, 2021 06:38
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Mar 12, 2021
@codecov
Copy link

codecov bot commented Mar 12, 2021 •
edited
Loading

Codecov Report

Merging #185 (b274e84) into main (fda53ac) will decrease coverage by 0.14%.
The diff coverage is 100.00%.

❗ Current head b274e84 differs from pull request most recent head 9092ae4. Consider uploading reports for the commit 9092ae4 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##             main     #185      +/-   ##
==========================================
- Coverage   75.71%   75.57%   -0.15%     
==========================================
  Files          73       73              
  Lines       10428    10406      -22     
==========================================
- Hits         7896     7864      -32     
- Misses       2532     2542      +10
Impacted Files Coverage Δ
graphics/src/ColladaLoader.cc 85.17% <ø> (-0.21%) ⬇️
graphics/src/OBJLoader.cc 92.85% <100.00%> (-0.25%) ⬇️
graphics/src/Image.cc 67.82% <0.00%> (-4.79%) ⬇️
src/Console.cc 84.80% <0.00%> (+0.79%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fda53ac...9092ae4. Read the comment docs.

ahcorde
ahcorde requested changes Mar 12, 2021
View reviewed changes
mjcarroll and others added 2 commits March 12, 2021 10:05
@mjcarroll @j-rivero
Remove use of _SOURCE and _BINARY dirs in tests (#158)
d00de14 
Test cleanup:

Merges test/util.hh and test_config.h into a single file (fixes include path issues)
Adds fixtures for retrieving test data from test/data folder
Moves testing utilities into ignition::common::testing

Signed-off-by: Michael Carroll <michael@openrobotics.org>
Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@chapulina
3 ➡️ 4
9092ae4 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina added the beta Targeting beta release of upcoming collection label Mar 17, 2021
@chapulina
Copy link
Contributor Author

I don't know why the actions CI is not being triggered. Closing and reopening to nudge it.

@chapulina chapulina closed this Mar 18, 2021
@chapulina chapulina reopened this Mar 18, 2021
@chapulina
Copy link
Contributor Author

It looks ok now 😬

@adlarkin
Copy link
Contributor

It looks like this forward port is missing commit 798f838. Can we add it in?

@mjcarroll
Copy link
Contributor

It looks like this forward port is missing commit 798f838. Can we add it in?

I would prefer to forward port this one separately, if that's okay.

@chapulina
Copy link
Contributor Author

All 🟢

@chapulina chapulina self-assigned this Mar 19, 2021
@chapulina chapulina merged commit 55f6fa1 into main Mar 19, 2021
@chapulina chapulina deleted the chapulina/3_to_4 branch March 19, 2021 02:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde requested changes

@adlarkin adlarkin adlarkin approved these changes

@mjcarroll mjcarroll Awaiting requested review from mjcarroll

Assignees

@chapulina chapulina

Labels
beta Targeting beta release of upcoming collection 🏢 edifice Ignition Edifice
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@chapulina @adlarkin @mjcarroll @ahcorde