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

5 ➡️ 6 #197

Merged
merged 9 commits into from
Aug 13, 2021
Merged

5 ➡️ 6 #197

merged 9 commits into from
Aug 13, 2021

Conversation

mjcarroll
Copy link
Contributor

➡️ Forward port

Port ign-fuel-tools5 to ign-fuel-tools6

Branch comparison: ign-fuel-tools6...ign-fuel-tools5

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

nkoenig and others added 9 commits April 30, 2021 08:15
@nkoenig @chapulina
Owner upload (#179)
3566ea7 
Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
@ahcorde
Fixed windows download (#178)
8674ed8 
* Fixed donwload on Windows

Signed-off-by: ahcorde <[email protected]>

* Fixed interface_TEST

Signed-off-by: ahcorde <[email protected]>

* Improved windows support

Signed-off-by: ahcorde <[email protected]>

* Make linters happy

Signed-off-by: ahcorde <[email protected]>

* Make linters happy

Signed-off-by: ahcorde <[email protected]>

* Improved

Signed-off-by: ahcorde <[email protected]>

* Fixed test on Windows

Signed-off-by: Alejandro Hernández <[email protected]>

* Fixed test

Signed-off-by: ahcorde <[email protected]>

* Fix some nits

Signed-off-by: ahcorde <[email protected]>

* Improved Windows support

Signed-off-by: ahcorde <[email protected]>

* Fixed test on Linux

Signed-off-by: ahcorde <[email protected]>

* make linters happy

Signed-off-by: ahcorde <[email protected]>

* Fixed windows tests

Signed-off-by: ahcorde <[email protected]>

* Fixed tests

Signed-off-by: ahcorde <[email protected]>

* Added feddback

Signed-off-by: ahcorde <[email protected]>

* make linters happy

Signed-off-by: ahcorde <[email protected]>
@chapulina
Remove tools/code_check and update codecov (#187)
3db16a1 
Signed-off-by: Louise Poubel <[email protected]>
@Lobotuerk
added fuel update command (#185)
dc59f86 
* added fuel update command

Signed-off-by: Tomas Lorente <[email protected]>

* fixed header

Signed-off-by: Tomas Lorente <[email protected]>

* fixed build

Signed-off-by: Tomas Lorente <[email protected]>

* updated docs

Signed-off-by: Tomas Lorente <[email protected]>

* added header

Signed-off-by: Tomas Lorente <[email protected]>

* fix

Signed-off-by: Tomas Lorente <[email protected]>

* nit2

Signed-off-by: Tomas Lorente <[email protected]>

* Style, and headers

Signed-off-by: Nate Koenig <[email protected]>

* Fixed world download

Signed-off-by: Nate Koenig <[email protected]>

* Removed debug

Signed-off-by: Nate Koenig <[email protected]>

* Fix tests

Signed-off-by: Nate Koenig <[email protected]>

* Fix windows

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
@chapulina
🎈 4.4.0 (#190)
d078bd0 
Signed-off-by: Louise Poubel <[email protected]>
@j-rivero
Detect ign instead of using cmake module to check for ignition-tools (#…
5bdaa28 
…191)

Signed-off-by: Louise Poubel <[email protected]>
@chapulina
4 ➡️ 5
7c1f8ba 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
4 ➡️ 5 (#193)
f3cd442 
Signed-off-by: Louise Poubel <[email protected]>
@mjcarroll
Merge branch 'ign-fuel-tools5' into ports/5_to_6_03AUG2021
a4ca233
@mjcarroll mjcarroll requested a review from nkoenig as a code owner August 3, 2021 21:54
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Aug 3, 2021
@mjcarroll mjcarroll changed the title Ports/5 to 6 03 aug2021 5 ➡️ 6 Aug 3, 2021
chapulina
chapulina approved these changes Aug 3, 2021
View reviewed changes
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

LGTM with happy CI

@codecov
Copy link

codecov bot commented Aug 3, 2021 •
edited
Loading

Codecov Report

Merging #197 (a4ca233) into ign-fuel-tools6 (8e76253) will decrease coverage by 1.91%.
The diff coverage is 25.71%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##           ign-fuel-tools6     #197      +/-   ##
===================================================
- Coverage            77.47%   75.55%   -1.92%     
===================================================
  Files                   20       20              
  Lines                 2672     2757      +85     
===================================================
+ Hits                  2070     2083      +13     
- Misses                 602      674      +72
Impacted Files Coverage Δ
src/CollectionIdentifier.cc 96.15% <ø> (ø)
src/ign.cc 57.40% <0.00%> (-3.47%) ⬇️
src/FuelClient.cc 65.90% <23.33%> (-3.78%) ⬇️
src/Zip.cc 68.75% <50.00%> (-0.77%) ⬇️
src/WorldIter.cc 97.84% <60.00%> (-2.16%) ⬇️
src/Interface.cc 88.46% <100.00%> (ø)
src/LocalCache.cc 79.47% <100.00%> (ø)
src/ModelIdentifier.cc 92.35% <100.00%> (ø)
src/ModelIter.cc 100.00% <100.00%> (ø)

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 8e76253...a4ca233. Read the comment docs.

@mjcarroll
Copy link
Contributor Author

@osrf-jenkins retest this please

@scpeters
Copy link
Member

scpeters commented Aug 6, 2021

new windows test failure:

C:\Jenkins\workspace\ignition_fuel-tools-ci-pr_any-windows7-amd64\ws\ign-fuel-tools\src\Helpers_TEST.cc:36
Expected equality of these values:
  common::joinPaths("localhost:8000", "some", "path")
    Which is: "localhost8000\\some\\path"
  uriToPath(uri)
    Which is: "localhost:8000\\some\\path"

@chapulina
Copy link
Contributor

new windows test failure:

I see this failing on ign-fuel-tools6:

https://build.osrfoundation.org/job/ign_fuel-tools-ign-6-win/2/testReport/junit/(root)/HelpersTEST/UriToPathNoAuthority/

I believe it's caused by some change upstream on ign-common.

I'm going to merge this PR since it didn't introduce the only test failure, and it fixes some of the test failures currently in ign-fuel-tools6/

@chapulina chapulina merged commit 3e3706e into ign-fuel-tools6 Aug 13, 2021
@chapulina chapulina deleted the ports/5_to_6_03AUG2021 branch August 13, 2021 23:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chapulina chapulina chapulina approved these changes

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

Assignees
No one assigned
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mjcarroll @scpeters @chapulina @nkoenig @ahcorde @Lobotuerk @j-rivero