Merge gz-fuel-tools8 ➡️ main #363
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Support downloading from a referal link Signed-off-by: Nate Koenig <natekoenig@gmail.com> * spelling Signed-off-by: Nate Koenig <natekoenig@gmail.com> * Address comments Signed-off-by: Nate Koenig <natekoenig@gmail.com> --------- Signed-off-by: Nate Koenig <natekoenig@gmail.com>
* 4.8.3 release Signed-off-by: Nate Koenig <natekoenig@gmail.com> * 4.8.3 Signed-off-by: Nate Koenig <natekoenig@gmail.com> --------- Signed-off-by: Nate Koenig <natekoenig@gmail.com>
The ModelIter iterator was fetching all available pages before making the first model available. This PR makes it so that each page is fetched from Fuel when the iterator is advanced. This also adds a new member function FuelClient::Models(onst ModelIdentifier &_id, bool _checkCache) that allows bypassing the cache when getting a list of models owned by a user from the server. --------- Signed-off-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>
Merge ign-fuel-tools4 ➡️ ign-fuel-tools7
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
* Replace ign log macros with gz Signed-off-by: Shameek Ganguly <shameekarcanesphinx@gmail.com> * Clangtidy fixes Signed-off-by: Shameek Ganguly <shameekarcanesphinx@gmail.com> * More clangtidy fixes Signed-off-by: Shameek Ganguly <shameekarcanesphinx@gmail.com> --------- Signed-off-by: Shameek Ganguly <shameekarcanesphinx@gmail.com>
Signed-off-by: Michael Carroll <michael@openrobotics.org> Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai> Co-authored-by: Nate Koenig <natekoenig@gmail.com>
Signed-off-by: Silvio Traversaro <silvio.traversaro@iit.it> Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org> Co-authored-by: Nate Koenig <natekoenig@gmail.com>
Fixes compiler warnings on macOS. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Merge ign-fuel-tools4 ➡️ ign-fuel-tools7
Merge ign-fuel-tools7 ➡️ gz-fuel-tools8
azeey
reviewed
Jul 20, 2023
include/gz/fuel_tools/config.hh.in
Outdated
| @@ -30,6 +30,6 @@ | |||
|
|
|||
| #define GZ_FUEL_TOOLS_VERSION_HEADER "Gazebo Fuel Tools, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" | |||
|
|
|||
| #define GZ_FUEL_INITIAL_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/" | |||
| #define GZ_FUEL_INITIAL_CONFIG_PATH _Pragma ("GCC warning \"'GZ_FUEL_INITIAL_CONFIG_PATH' macro is deprecated and should not be used. \"") "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/" | |||
There was a problem hiding this comment.
I think this can be removed.
There was a problem hiding this comment.
removed in ae5dbe1 and added to Migration guide
src/cmd/CMakeLists.txt
Outdated
| endif() | ||
| # Unlike other gz libraries, the ruby script for the fuel_tools library is called cmdfuel.rb instead of cmdfuel_tools.rb | ||
| set(CMD_NAME cmdfuel) | ||
| set(cmd_script_generated_test "${CMAKE_BINARY_DIR}/test/lib/$<CONFIG>/ruby/ignition/${CMD_NAME}${PROJECT_VERSION_MAJOR}.rb") |
There was a problem hiding this comment.
I amended the merge commit to 31bb997 with this change
|
EDIT: maybe this was related to a network issue because it seems to be passing in the most recent builds |
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters
force-pushed
the
scpeters/merge_8_9
branch
from
255b9b6
to
ae5dbe1
Compare
Codecov Report
@@ Coverage Diff @@
## main #363 +/- ##
==========================================
+ Coverage 75.30% 75.32% +0.02%
==========================================
Files 20 20
Lines 2911 2910 -1
==========================================
Hits 2192 2192
+ Misses 719 718 -1
|
|
as in #362 (comment), the windows test failures are already present on the |
azeey
approved these changes
Jul 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
➡️ Forward port
Port
gz-fuel-tools8➡️mainBranch comparison: main...gz-fuel-tools8
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)