Skip to content

Commit

Permalink
Merge pull request gazebosim#214 from gazebosim/scpeters/merge_2_5
Browse files Browse the repository at this point in the history
Merge ign-launch2 ➡️  ign-launch5
  • Loading branch information
scpeters authored Mar 28, 2023
2 parents be1ea4c + 1ed44f7 commit aa5f470
Show file tree
Hide file tree
Showing 11 changed files with 228 additions and 220 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Ubuntu Bionic CI
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@bionic
Expand All @@ -19,7 +19,7 @@ jobs:
name: Ubuntu Focal CI
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@focal
Expand All @@ -28,7 +28,7 @@ jobs:
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@jammy
178 changes: 0 additions & 178 deletions COPYING

This file was deleted.

24 changes: 21 additions & 3 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,25 @@
1. Depend on ign-gazebo4, ign-gui4
* [BitBucket pull request 64](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-launch/pull-requests/64)

## Ignition Launch 2.x
## 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)

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

Expand Down Expand Up @@ -209,8 +227,8 @@

### Ignition Launch 1.10.0 (2020-09-25)

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

1. Add PKGCONFIG information to ignition-tools ign_find_package
* [Pull Request 44](https://github.com/ignitionrobotics/ign-launch/pull/44)
Expand Down
Loading

0 comments on commit aa5f470

Please sign in to comment.