From 7e694a02c412d4595d92cb3351a5f7b6e0b44b0d Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 31 Aug 2023 15:17:02 -0500 Subject: [PATCH 1/2] Prepare for 2.17.1 release (#383) Signed-off-by: Addisu Z. Taddese --- CMakeLists.txt | 2 +- Changelog.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c38f39af..0b6d3657 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(ignition-cmake2 VERSION 2.17.0) +project(ignition-cmake2 VERSION 2.17.1) #-------------------------------------- # Initialize the IGNITION_CMAKE_DIR variable with the location of the cmake diff --git a/Changelog.md b/Changelog.md index 455023d2..a5006171 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,10 @@ ## 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 From f527f37fc86f9197c8b87ed3e524ba9dfc8ee684 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 13 Nov 2023 10:22:42 -0600 Subject: [PATCH 2/2] Update github action workflows (#395) * Update github action workflows * Use on `push` only on stable branches to avoid duplicate runs * Update project automation --------- Signed-off-by: Addisu Z. Taddese --- .github/workflows/ci.yml | 14 ++++++++++---- .github/workflows/triage.yml | 9 +++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff187303..22ce8ba5 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: bionic-ci: @@ -8,7 +14,7 @@ jobs: 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 @@ -20,7 +26,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 @@ -31,7 +37,7 @@ jobs: name: Ubuntu Jammy CI steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Compile and test id: ci uses: ignition-tooling/action-ignition-ci@jammy diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index 736670e0..2332244b 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -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/add-to-project@v0.5.0 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 }}