9 ➡️ main #423
Merged
9 ➡️ main #423
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
* Use on `push` only on stable branches to avoid duplicate runs * Update project automation Signed-off-by: Addisu Z. Taddese <[email protected]>
* Use on `push` only on stable branches to avoid duplicate runs * Update project automation Signed-off-by: Addisu Z. Taddese <[email protected]>
Windows doesn't support colon or at-symbol in paths. This disables the tests on gz-fuel-tools8, as we want to preserve the behavior (to not invalidate anyone's current cache). On gz-fuel-tools9 forward, the fix is implemented. Do not forward port these changes Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-fuel-tools4 ➡️ ign-fuel-tools7
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-fuel-tools7 ➡️ gz-fuel-tools8
Signed-off-by: Carlos Agüero <[email protected]>
Merge 8 ➡️ 9
Signed-off-by: Addisu Z. Taddese <[email protected]>
…botics.org can be found in the cache (#406) Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
* Use config.yaml file from default cache location, if it exists Signed-off-by: Nate Koenig <[email protected]> * support config.yml Signed-off-by: Nate Koenig <[email protected]> --------- Signed-off-by: Nate Koenig <[email protected]>
* Add Private function to world identifier Signed-off-by: Nate Koenig <[email protected]> * Update include/gz/fuel_tools/WorldIdentifier.hh Co-authored-by: Alejandro Hernández Cordero <[email protected]> Signed-off-by: Nate Koenig <[email protected]> * Wrap line Signed-off-by: Nate Koenig <[email protected]> --------- Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Alejandro Hernández Cordero <[email protected]>
* Cleanup curl pointer * Do not duplicate version for gz_TEST * curl_free missing for decodedPath * Missing curl_free for encodedRes --------- Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
…Noble) (#415) * Migrate curl_formadd from form API to mime API Signed-off-by: Jose Luis Rivero <[email protected]> * Restore curl_easy_setopt call and use MIMEPOST Signed-off-by: Jose Luis Rivero <[email protected]> --------- Signed-off-by: Jose Luis Rivero <[email protected]> Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Forwardport 8 to 9 2024-04-29
Signed-off-by: Crola1702 <[email protected]>
azeey
approved these changes
May 30, 2024
|
I can't merge because GitHub says "This branch cannot be rebased due to conflicts". Can you merge from |
|
I don't see any new changes from main, so I don't have anything else to push here 🤔 |
azeey
requested changes
May 31, 2024
package.xml
Outdated
| <?xml version="1.0"?> | ||
| <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?> | ||
| <package format="2"> | ||
| <name>gz-fuel_tools9</name> |
There was a problem hiding this comment.
Suggested change
| <name>gz-fuel_tools9</name> | |
| <name>gz-fuel_tools10</name> |
package.xml
Outdated
| <depend>gz-math8</depend> | ||
| <depend>gz-msgs11</depend> | ||
| <depend>gz-tools2</depend> | ||
| <depend>gz-utils2</depend> |
There was a problem hiding this comment.
Suggested change
| <depend>gz-utils2</depend> | |
| <depend>gz-utils3</depend> |
Signed-off-by: Jorge J. Perez <[email protected]>
azeey
approved these changes
Jun 6, 2024
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 9 to main
Branch comparison: main...9
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)