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

Merge gz-plugin2 ➡️ main #145

Merged
merged 13 commits into from
May 24, 2024
Merged

Merge gz-plugin2 ➡️ main #145

merged 13 commits into from
May 24, 2024

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port gz-plugin2 ➡️ main

Branch comparison: main...gz-plugin2

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

j-rivero and others added 13 commits September 12, 2023 13:47
* Do not install CMakeLists.txt in loader/register

By including the installation of a whole directory in the source code
for loader/register, the buildsystem is installing the CMakeLists.txt
files that are included in these directories. Exclude them from the
final installation by using the EXCLUDE clause in CMake.

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
* Use on `push` only on stable branches to avoid duplicate runs
* Update project automation

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Merge ign-plugin1 ➡️  gz-plugin2
…) (#138)

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>
Signed-off-by: Michael Beardsworth <beardsworth@intrinsic.ai>
Co-authored-by: Michael Beardsworth <beardsworth@intrinsic.ai>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@github-actions github-actions bot added the 🏛️ ionic Gazebo Ionic label May 24, 2024
@scpeters scpeters merged commit 9ab8376 into main May 24, 2024
8 checks passed
@scpeters scpeters deleted the scpeters/merge_2_main branch May 24, 2024 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏛️ ionic Gazebo Ionic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants