Skip to content

Commit

Permalink
Merge pull request #243 from azeey/5_to_6
Browse files Browse the repository at this point in the history
Merge ign-launch5 ➡️  gz-launch6
  • Loading branch information
azeey authored Jan 19, 2024
2 parents e35e043 + 1c5a488 commit 8407218
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 4 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
name: Ubuntu CI

on: [push, pull_request]
on:
pull_request:
push:
branches:
- 'ign-launch[0-9]'
- 'gz-launch[0-9]?'
- 'main'

jobs:
focal-ci:
runs-on: ubuntu-latest
name: Ubuntu Focal CI
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@focal
Expand All @@ -21,7 +27,7 @@ jobs:
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@jammy
1 change: 0 additions & 1 deletion .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ jobs:
with:
project-url: https://github.com/orgs/gazebosim/projects/7
github-token: ${{ secrets.TRIAGE_TOKEN }}

33 changes: 33 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,29 @@

## Gazebo Launch 5.x

### Gazebo Launch 5.3.0 (2023-06-14)

1. Forward ports
* [Pull request #214](https://github.com/gazebosim/gz-launch/pull/214)

1. Infrastructure
* [Pull request #213](https://github.com/gazebosim/gz-launch/pull/213)

1. Rename COPYING to LICENSE
* [Pull request #212](https://github.com/gazebosim/gz-launch/pull/212)

1. Small cleanup fixes
* [Pull request #211](https://github.com/gazebosim/gz-launch/pull/211)

1. Add pause and stop to Websocket Server
* [Pull request #187](https://github.com/gazebosim/gz-launch/pull/187)

1. Return a message on asset error
* [Pull request #197](https://github.com/gazebosim/gz-launch/pull/197)

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

### Gazebo Launch 5.2.0 (2022-08-16)

1. Add code coverage ignore file
Expand Down Expand Up @@ -210,6 +233,16 @@

## Gazebo Launch 2.x

### Gazebo Launch 2.3.1 (2024-01-05)

1. Small cleanup fixes
* [Pull request #211](https://github.com/gazebosim/gz-launch/pull/211)

1. Infrastructure
* [Pull request #238](https://github.com/gazebosim/gz-launch/pull/238)
* [Pull request #213](https://github.com/gazebosim/gz-launch/pull/213)
* [Pull request #212](https://github.com/gazebosim/gz-launch/pull/212)

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

1. Remove redundant namespace references
Expand Down

0 comments on commit 8407218

Please sign in to comment.