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

Merge gz-cmake3 ➡️ main #401

Merged
merged 8 commits into from
Jan 19, 2024
Merged

Merge gz-cmake3 ➡️ main #401

merged 8 commits into from
Jan 19, 2024

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Jan 18, 2024

➡️ Forward port

Port gz-cmake3 ➡️ main

Branch comparison: main...gz-cmake3

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

azeey and others added 5 commits August 31, 2023 15:17
@azeey
Prepare for 2.17.1 release (gazebosim#383)
7e694a0 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@j-rivero @scpeters
Change EXTRA_ARGS to be a multiValueArgs in GzFindPackage (gazebosim#393
40db6b2 
)

Add test for EXTRA_ARGS to gz_find_package

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
@azeey
Update github action workflows (gazebosim#395)
f527f37 
* Update github action workflows

* Use on `push` only on stable branches to avoid duplicate runs
* Update project automation

---------

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@iche033
Update CI badges in README (gazebosim#398)
06f90c3 
Signed-off-by: Ian Chen <ichen@openrobotics.org>
@mjcarroll
Remove exec_program call (gazebosim#399)
5624119 
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
@github-actions github-actions bot added the 🏛️ ionic Gazebo Ionic label Jan 18, 2024
azeey and others added 2 commits January 18, 2024 13:22
@azeey
Merge 2 into 3
0eedec5 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@scpeters
Merge pull request gazebosim#403 from azeey/2_to_3
ecb2fbc 
Merge ign-cmake2 ➡️  gz-cmake3
@scpeters
Copy link
Member

do you mind merging again with gz-cmake3 since #403 was just merged?

@azeey
Merge 3 to main
ede1616 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey
Copy link
Contributor Author

azeey commented Jan 18, 2024

do you mind merging again with gz-cmake3 since #403 was just merged?

Done.

@scpeters scpeters merged commit 2d1f56b into gazebosim:main Jan 19, 2024
3 checks passed
@Crola1702 Crola1702 mentioned this pull request Jan 23, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scpeters scpeters scpeters approved these changes

@iche033 iche033 iche033 approved these changes

@mxgrey mxgrey Awaiting requested review from mxgrey

@j-rivero j-rivero Awaiting requested review from j-rivero j-rivero is a code owner

Assignees
No one assigned
Labels
🏛️ ionic Gazebo Ionic
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@azeey @scpeters @iche033 @j-rivero @mjcarroll