Merge pull request #245 from gazebosim/6_to_7again

Merge 6 ➡️ 7
gazebosim · Feb 5, 2024 · 34ac377 · 34ac377
2 parents 11ea919 + 909042b
commit 34ac377
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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

diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
@@ -14,4 +14,3 @@ jobs:
         with:
           project-url: https://github.com/orgs/gazebosim/projects/7
           github-token: ${{ secrets.TRIAGE_TOKEN }}
-
diff --git a/Changelog.md b/Changelog.md
@@ -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
@@ -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