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

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
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
* Fixed donwload on Windows

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Fixed interface_TEST

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Improved windows support

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Make linters happy

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Make linters happy

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Improved

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Fixed test on Windows

Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>

* Fixed test

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Fix some nits

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Improved Windows support

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Fixed test on Linux

Signed-off-by: ahcorde <ahcorde@gmail.com>

* make linters happy

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Fixed windows tests

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Fixed tests

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Added feddback

Signed-off-by: ahcorde <ahcorde@gmail.com>

* make linters happy

Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
* added fuel update command

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* fixed header

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* fixed build

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* updated docs

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* added header

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* fix

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* nit2

Signed-off-by: Tomas Lorente <jtlorente@ekumenlabs.com>

* Style, and headers

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fixed world download

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Removed debug

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix tests

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix windows

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
…191)

Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@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
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

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
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants