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 #148

Merged
merged 16 commits into from
Dec 23, 2020
Merged

5 ➡️ 6 #148

merged 16 commits into from
Dec 23, 2020

Conversation

chapulina
Copy link
Contributor

Forward-port ign-fuel-tools5 to main

nkoenig and others added 16 commits November 30, 2020 09:57
)

* Use lowercase resource and owner names when storing assets on disk

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

* Remove added diff text from merge

Signed-off-by: John Shepherd <[email protected]>

* change model version in test back

Signed-off-by: John Shepherd <[email protected]>

* Fix test

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

* Fix windows

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

* Fix more windows tests

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

* Testing another windows fix

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: John Shepherd <[email protected]>
* Prepare for 3.5.0 release

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

* Update Changelog.md

Co-authored-by: Louise Poubel <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
Signed-off-by: John Shepherd <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

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

Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
* Support editing/patching model files

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

* Added documentation

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

* Set keep alive on

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

* Documentation and tests

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

* One more test and exit catch missing -u

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

Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@codecov
Copy link

codecov bot commented Dec 23, 2020

Codecov Report

Merging #148 (ea61567) into main (f8c62dd) will increase coverage by 1.44%.
The diff coverage is 46.56%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #148      +/-   ##
==========================================
+ Coverage   76.54%   77.99%   +1.44%     
==========================================
  Files          19       19              
  Lines        2554     2604      +50     
==========================================
+ Hits         1955     2031      +76     
+ Misses        599      573      -26     
Impacted Files Coverage Δ
src/ign.cc 60.86% <0.00%> (-0.90%) ⬇️
src/FuelClient.cc 70.64% <42.99%> (+4.78%) ⬆️
src/LocalCache.cc 80.00% <66.66%> (-0.13%) ⬇️
src/ModelIdentifier.cc 92.35% <100.00%> (+0.09%) ⬆️
src/RestClient.cc 67.91% <100.00%> (+11.42%) ⬆️
src/WorldIdentifier.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 f8c62dd...ea61567. Read the comment docs.

@nkoenig nkoenig merged commit 675f748 into main Dec 23, 2020
@nkoenig nkoenig deleted the chapulina/5_to_6 branch December 23, 2020 22:58
@chapulina
Copy link
Contributor Author

chapulina commented Dec 24, 2020

Oh this shouldn't have been squash-merged 😬 The comparison still shows all the merged commits now 😕

main...ign-fuel-tools5

@chapulina chapulina mentioned this pull request Dec 24, 2020
@chapulina
Copy link
Contributor Author

Oh this shouldn't have been squash-merged

Fixed in #153

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants