Skip to content

Commit 8407218

Browse files
authored
Merge pull request #243 from azeey/5_to_6
Merge ign-launch5 ➡️ gz-launch6
2 parents e35e043 + 1c5a488 commit 8407218

File tree

3 files changed

+42
-4
lines changed

3 files changed

+42
-4
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
name: Ubuntu CI
22

3-
on: [push, pull_request]
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- 'ign-launch[0-9]'
8+
- 'gz-launch[0-9]?'
9+
- 'main'
410

511
jobs:
612
focal-ci:
713
runs-on: ubuntu-latest
814
name: Ubuntu Focal CI
915
steps:
1016
- name: Checkout
11-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1218
- name: Compile and test
1319
id: ci
1420
uses: gazebo-tooling/action-gz-ci@focal
@@ -21,7 +27,7 @@ jobs:
2127
name: Ubuntu Jammy CI
2228
steps:
2329
- name: Checkout
24-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
2531
- name: Compile and test
2632
id: ci
2733
uses: gazebo-tooling/action-gz-ci@jammy

.github/workflows/triage.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@ jobs:
1414
with:
1515
project-url: https://github.com/orgs/gazebosim/projects/7
1616
github-token: ${{ secrets.TRIAGE_TOKEN }}
17-

Changelog.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,29 @@
5959

6060
## Gazebo Launch 5.x
6161

62+
### Gazebo Launch 5.3.0 (2023-06-14)
63+
64+
1. Forward ports
65+
* [Pull request #214](https://github.com/gazebosim/gz-launch/pull/214)
66+
67+
1. Infrastructure
68+
* [Pull request #213](https://github.com/gazebosim/gz-launch/pull/213)
69+
70+
1. Rename COPYING to LICENSE
71+
* [Pull request #212](https://github.com/gazebosim/gz-launch/pull/212)
72+
73+
1. Small cleanup fixes
74+
* [Pull request #211](https://github.com/gazebosim/gz-launch/pull/211)
75+
76+
1. Add pause and stop to Websocket Server
77+
* [Pull request #187](https://github.com/gazebosim/gz-launch/pull/187)
78+
79+
1. Return a message on asset error
80+
* [Pull request #197](https://github.com/gazebosim/gz-launch/pull/197)
81+
82+
1. Remove redundant namespace references
83+
* [Pull request #190](https://github.com/gazebosim/gz-launch/pull/190)
84+
6285
### Gazebo Launch 5.2.0 (2022-08-16)
6386

6487
1. Add code coverage ignore file
@@ -210,6 +233,16 @@
210233

211234
## Gazebo Launch 2.x
212235

236+
### Gazebo Launch 2.3.1 (2024-01-05)
237+
238+
1. Small cleanup fixes
239+
* [Pull request #211](https://github.com/gazebosim/gz-launch/pull/211)
240+
241+
1. Infrastructure
242+
* [Pull request #238](https://github.com/gazebosim/gz-launch/pull/238)
243+
* [Pull request #213](https://github.com/gazebosim/gz-launch/pull/213)
244+
* [Pull request #212](https://github.com/gazebosim/gz-launch/pull/212)
245+
213246
### Gazebo Launch 2.3.0 (2022-08-15)
214247

215248
1. Remove redundant namespace references

0 commit comments

Comments
 (0)