Skip to content

Commit

Permalink
Merge branch 'ign-launch2' into citadel_header_redirects
Browse files Browse the repository at this point in the history
  • Loading branch information
nkoenig committed Jan 16, 2024
2 parents c73ef80 + 3c40338 commit 25c856d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 10 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:
bionic-ci:
runs-on: ubuntu-latest
name: Ubuntu Bionic CI
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@bionic
Expand All @@ -19,7 +25,7 @@ jobs:
name: Ubuntu Focal CI
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@focal
9 changes: 3 additions & 6 deletions .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Add ticket to inbox
uses: technote-space/create-project-card-action@v1
uses: actions/[email protected]
with:
PROJECT: Core development
COLUMN: Inbox
GITHUB_TOKEN: ${{ secrets.TRIAGE_TOKEN }}
CHECK_ORG_PROJECT: true

project-url: https://github.com/orgs/gazebosim/projects/7
github-token: ${{ secrets.TRIAGE_TOKEN }}
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-launch2 VERSION 2.3.0)
project(ignition-launch2 VERSION 2.3.1)

#============================================================================
# Find ignition-cmake
Expand Down
10 changes: 10 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
## 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 25c856d

Please sign in to comment.