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 2 -> main #126

Merged
merged 15 commits into from
Oct 12, 2023
Merged

Merge 2 -> main #126

merged 15 commits into from
Oct 12, 2023

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Sep 26, 2023

➡️ Forward port

Port gz-pluin2 to main

Branch comparison: main...gz-pluin2

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

nkoenig and others added 15 commits November 17, 2022 13:33
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Signed-off-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
The LICENSE file contained a copy of the stanze
used at the top of source code files, while the
actual license was in the COPYING file. So remove
the stanza and put the actual Apache 2.0 license text
in LICENSE.

Similar to gazebosim/gz-math#521.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Version v2 of the actions/checkout workflow is
deprecated, so switch to v3.

Part of gazebo-tooling/release-tools#862.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Merge ign-plugin1 ➡️  gz-plugin2
Signed-off-by: Shameek Ganguly <shameekarcanesphinx@gmail.com>
Signed-off-by: Shameek Ganguly <shameekarcanesphinx@gmail.com>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
* Remove Windows 7 and align with other

- remove Windows 7
- align description style with other README files

Signed-off-by: Bi0T1N <28802083+Bi0T1N@users.noreply.github.com>

* Fix links

- update version
- fix link for documentation

Signed-off-by: Bi0T1N <28802083+Bi0T1N@users.noreply.github.com>

* Change build status link for Windows

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Bi0T1N <28802083+Bi0T1N@users.noreply.github.com>

---------

Signed-off-by: Bi0T1N <28802083+Bi0T1N@users.noreply.github.com>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
@codecov
Copy link

codecov bot commented Sep 26, 2023

Codecov Report

Merging #126 (88d429b) into main (931428a) will not change coverage.
Report is 10 commits behind head on main.
The diff coverage is 100.00%.

❗ Current head 88d429b differs from pull request most recent head 1ccb910. Consider uploading reports for the commit 1ccb910 to get more accurate results

@@           Coverage Diff           @@
##             main     #126   +/-   ##
=======================================
  Coverage   98.26%   98.26%           
=======================================
  Files          23       23           
  Lines         748      748           
=======================================
  Hits          735      735           
  Misses         13       13           
Files Coverage Δ
core/src/utility.cc 100.00% <100.00%> (ø)
loader/src/Loader.cc 100.00% <ø> (ø)
loader/src/cmd/gz.cc 88.88% <100.00%> (ø)

@azeey azeey self-requested a review October 5, 2023 21:41
@scpeters scpeters merged commit b7561e8 into main Oct 12, 2023
9 checks passed
@scpeters scpeters deleted the merge_2_main_20230926 branch October 12, 2023 22:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

7 participants