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.

Sign up for GitHub

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 6 ➡️ 7 #245

Merged
merged 8 commits into from
Feb 5, 2024
Merged

Merge 6 ➡️ 7 #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
894e2e2
5.3.0 Release (#221)
azeey Jun 15, 2023
3822e48
Update github action workflows (#238)
azeey Nov 27, 2023
3c40338
Prepare for 2.3.1 release (#240)
azeey Jan 6, 2024
aee0310
Merge 2 to 5
azeey Jan 12, 2024
efe7404
Merge pull request #242 from azeey/2_to_5
azeey Jan 12, 2024
1c5a488
Merge 5 into 6
azeey Jan 18, 2024
8407218
Merge pull request #243 from azeey/5_to_6
azeey Jan 19, 2024
909042b
Merge branch 'gz-launch6' into 6_to_7again
caguero Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
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:
jammy-ci:
runs-on: ubuntu-latest
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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/triage.yml
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,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 @@ -231,6 +254,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
Loading