diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1c73026..025f28fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,12 @@ name: Ubuntu CI -on: [push, pull_request] +on: + pull_request: + push: + branches: + - 'ign-cmake[0-9]' + - 'gz-cmake[0-9]' + - 'main' jobs: focal-ci: @@ -8,7 +14,7 @@ jobs: 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 @@ -19,7 +25,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 diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index 2c94852d..2332244b 100644 --- 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 index 8cf2c766..8993798e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -176,6 +176,11 @@ ## Gazebo CMake 2.x +### Gazebo CMake 2.17.1 (2023-08-31) + +1. FindIgnOgre*: fix LIBRARY_DIRS and PLUGINDIR resolution when using pkgconfig + * [Pull request #376](https://github.com/gazebosim/gz-cmake/pull/376) + ### Gazebo CMake 2.17.0 (2023-05-19) 1. Use CONFIG in gz_add_benchmark to avoid Windows collisions