Skip to content

Commit

Permalink
Merge pull request #215 from gazebosim/scpeters/merge_5_6
Browse files Browse the repository at this point in the history
Merge ign-launch5 ➡️  gz-launch6
  • Loading branch information
scpeters authored Apr 28, 2023
2 parents c09ee8c + 4ed3605 commit 7a81015
Show file tree
Hide file tree
Showing 13 changed files with 330 additions and 229 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Ubuntu Focal CI
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@focal
Expand All @@ -21,7 +21,7 @@ jobs:
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@jammy
178 changes: 0 additions & 178 deletions COPYING

This file was deleted.

20 changes: 19 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,24 @@

## Gazebo Launch 2.x

### Gazebo Launch 2.3.0 (2022-08-15)

1. Remove redundant namespace references
* [Pull request #190](https://github.com/gazebosim/gz-launch/pull/190)

1. Add code coverage ignore file
* [Pull request #179](https://github.com/gazebosim/gz-launch/pull/179)

1. Change `IGN_DESIGNATION` to `GZ_DESIGNATION`
* [Pull request #181](https://github.com/gazebosim/gz-launch/pull/181)
* [Pull request #182](https://github.com/gazebosim/gz-launch/pull/182)

1. Ignition -> Gazebo
* [Pull request #178](https://github.com/gazebosim/gz-launch/pull/178)

1. Bash completion for flags
* [Pull request #167](https://github.com/gazebosim/gz-launch/pull/167)

### Gazebo Launch 2.2.2 (2021-10-11)

1. Master branch updates.
Expand Down Expand Up @@ -248,7 +266,7 @@
### Gazebo Launch 1.10.0 (2020-09-25)

* Modernize Github Actions CI.
* [Pull request 42](https://github.com/gazebosim/gz-launch/pull/42)
* [Pull request 42](https://github.com/gazebosim/gz-launch/pull/42)

1. Add PKGCONFIG information to gz-tools gz_find_package
* [Pull Request 44](https://github.com/gazebosim/gz-launch/pull/44)
Expand Down
Loading

0 comments on commit 7a81015

Please sign in to comment.