From 746ee8d015cdb7f00c91b2239b50a2c558b1c0c3 Mon Sep 17 00:00:00 2001 From: Grey Date: Thu, 19 Dec 2024 17:44:05 +0800 Subject: [PATCH] Add Jazzy and remove Iron from CI (#112) Signed-off-by: Michael X. Grey --- .github/workflows/asan.yaml | 10 +++++----- .github/workflows/build.yaml | 16 ++++++++-------- .github/workflows/tsan.yaml | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/asan.yaml b/.github/workflows/asan.yaml index 3a7d6630..0d70c967 100644 --- a/.github/workflows/asan.yaml +++ b/.github/workflows/asan.yaml @@ -9,7 +9,7 @@ jobs: name: asan runs-on: ubuntu-22.04 container: - image: osrf/ros:iron-desktop-jammy + image: osrf/ros:jazzy-desktop-noble steps: - name: create_blacklist run: | @@ -19,12 +19,12 @@ jobs: - name: install_clang_and_tools run: sudo apt update && sudo apt install -y clang clang-tools lld wget python3-pip python3-colcon-coveragepy-result python3-colcon-lcov-result lcov - name: build_and_test - uses: ros-tooling/action-ros-ci@0.3.5 + uses: ros-tooling/action-ros-ci@v0.3 env: CC: clang -fsanitize-blacklist=${{ github.workspace }}/blacklist.txt CXX: clang++ -fsanitize-blacklist=${{ github.workspace }}/blacklist.txt with: - target-ros2-distro: iron + target-ros2-distro: jazzy # build all packages listed in the meta package package-name: | rmf_traffic @@ -40,13 +40,13 @@ jobs: } colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml - name: Upload failed test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: test-results path: ros_ws/build/*/test_results/*/*.catch2.xml - name: upload_test_stream - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: colcon-test-logs path: ${{ steps.build_and_test.outputs.ros-workspace-directory-name }}/log diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cd890674..63de1253 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,19 +13,19 @@ jobs: matrix: ros_distribution: - humble - - iron + - jazzy - rolling include: # Humble Hawksbill (May 2022 - May 2027) - ubuntu_distribution: jammy ros_distribution: humble ros_version: 2 - # Iron Irwini (May 2023 - November 2024) - - ubuntu_distribution: jammy - ros_distribution: iron + # Jazzy Jalisco (May 2024 - May 2029) + - ubuntu_distribution: noble + ros_distribution: jazzy ros_version: 2 # Rolling Ridley (No End-Of-Life) - - ubuntu_distribution: jammy + - ubuntu_distribution: noble ros_distribution: rolling ros_version: 2 container: @@ -34,11 +34,11 @@ jobs: - name: pwd run: pwd - name: setup ROS environment - uses: ros-tooling/setup-ros@0.7.1 + uses: ros-tooling/setup-ros@v0.7 with: required-ros-distributions: ${{ matrix.ros_distribution }} - name: build - uses: ros-tooling/action-ros-ci@0.3.5 + uses: ros-tooling/action-ros-ci@v0.3 with: target-ros2-distro: ${{ matrix.ros_distribution }} # build all packages listed in the meta package @@ -54,7 +54,7 @@ jobs: } colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml - name: Upload failed test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: test-results diff --git a/.github/workflows/tsan.yaml b/.github/workflows/tsan.yaml index 16356ffc..cc3ab65e 100644 --- a/.github/workflows/tsan.yaml +++ b/.github/workflows/tsan.yaml @@ -9,7 +9,7 @@ jobs: name: tsan runs-on: ubuntu-22.04 container: - image: osrf/ros:iron-desktop-jammy + image: osrf/ros:jazzy-desktop-noble steps: - name: install_clang_and_tools run: sudo apt update && sudo apt install -y clang clang-tools lld wget python3-pip python3-colcon-coveragepy-result python3-colcon-lcov-result lcov @@ -17,10 +17,10 @@ jobs: env: CC: clang CXX: clang++ - uses: ros-tooling/action-ros-ci@0.3.5 + uses: ros-tooling/action-ros-ci@v0.3 id: tsan_build_test with: - target-ros2-distro: iron + target-ros2-distro: jazzy # build all packages listed in the meta package package-name: | rmf_traffic @@ -35,13 +35,13 @@ jobs: } colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml - name: Upload failed test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: test-results path: ros_ws/build/*/test_results/*/*.catch2.xml - name: upload_test_stream - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: colcon-test-logs path: ${{ steps.tsan_build_test.outputs.ros-workspace-directory-name }}/log