From 13ed9137a5633c7ea32925750b854b27149e7134 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Sat, 30 Nov 2024 17:43:12 -0800 Subject: [PATCH 1/3] Re-enabling jazzy CI build --- .github/workflows/cmake-ros.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake-ros.yml b/.github/workflows/cmake-ros.yml index bc78b662e4..ee88c341c5 100644 --- a/.github/workflows/cmake-ros.yml +++ b/.github/workflows/cmake-ros.yml @@ -23,17 +23,14 @@ jobs: strategy: fail-fast: false matrix: - ros_distribution: [ noetic, humble, iron] + ros_distribution: [ noetic, humble, jazzy] include: - ros_distribution: 'noetic' os: ubuntu-20.04 - ros_distribution: 'humble' os: ubuntu-22.04 - - ros_distribution: 'iron' - os: ubuntu-22.04 - # Currently CI has some errors on setup-ros with this OS, disabling for now - #- ros_distribution: 'jazzy' - # os: ubuntu-24.04 + - ros_distribution: 'jazzy' + os: ubuntu-24.04 steps: - uses: ros-tooling/setup-ros@v0.6 From b55759174d6d66c7070757814aba92fe6eacec11 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Sat, 30 Nov 2024 17:57:01 -0800 Subject: [PATCH 2/3] CI: upgrading ros-tooling to 0.7 --- .github/workflows/cmake-ros.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-ros.yml b/.github/workflows/cmake-ros.yml index ee88c341c5..5ce664c25a 100644 --- a/.github/workflows/cmake-ros.yml +++ b/.github/workflows/cmake-ros.yml @@ -33,7 +33,7 @@ jobs: os: ubuntu-24.04 steps: - - uses: ros-tooling/setup-ros@v0.6 + - uses: ros-tooling/setup-ros@v0.7 with: required-ros-distributions: ${{ matrix.ros_distribution }} From 10eea91044397c9742ceedefd1bfe230feac5c03 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Sat, 30 Nov 2024 18:06:41 -0800 Subject: [PATCH 3/3] CI: added builds when pushing to ***-devel branches --- .github/workflows/cmake-ros.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/cmake-ros.yml b/.github/workflows/cmake-ros.yml index 5ce664c25a..900a13af15 100644 --- a/.github/workflows/cmake-ros.yml +++ b/.github/workflows/cmake-ros.yml @@ -4,6 +4,9 @@ on: push: branches: - master + - noetic-devel + - humble-devel + - jazzy-devel pull_request: branches: - '**' @@ -32,6 +35,7 @@ jobs: - ros_distribution: 'jazzy' os: ubuntu-24.04 + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/${{ matrix.ros_distribution }}-devel' steps: - uses: ros-tooling/setup-ros@v0.7 with: