From 855cda1f26b76c7eda9b2d3f03b635c8401ea632 Mon Sep 17 00:00:00 2001 From: "Michael X. Grey" Date: Thu, 19 Dec 2024 17:01:53 +0800 Subject: [PATCH 1/4] Remove Iron from CI Signed-off-by: Michael X. Grey --- .github/workflows/asan.yaml | 4 ++-- .github/workflows/build.yaml | 10 +++++----- .github/workflows/tsan.yaml | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/asan.yaml b/.github/workflows/asan.yaml index 3a7d6630..f3e084bb 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: | @@ -24,7 +24,7 @@ jobs: 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 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cd890674..2bf6b329 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: diff --git a/.github/workflows/tsan.yaml b/.github/workflows/tsan.yaml index 16356ffc..424f31c7 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 @@ -20,7 +20,7 @@ jobs: uses: ros-tooling/action-ros-ci@0.3.5 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 From f8e962923b8e45d25c84d890d4a67ad7ab2cf79e Mon Sep 17 00:00:00 2001 From: "Michael X. Grey" Date: Thu, 19 Dec 2024 17:11:21 +0800 Subject: [PATCH 2/4] Update version of upload-artifact Signed-off-by: Michael X. Grey --- .github/workflows/asan.yaml | 4 ++-- .github/workflows/build.yaml | 2 +- .github/workflows/tsan.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/asan.yaml b/.github/workflows/asan.yaml index f3e084bb..b003c61b 100644 --- a/.github/workflows/asan.yaml +++ b/.github/workflows/asan.yaml @@ -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 2bf6b329..73385fc9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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 424f31c7..ed9df5ab 100644 --- a/.github/workflows/tsan.yaml +++ b/.github/workflows/tsan.yaml @@ -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 From 04ddddf05f0f2e5d378465f75dbc9479250e4f55 Mon Sep 17 00:00:00 2001 From: "Michael X. Grey" Date: Thu, 19 Dec 2024 17:27:20 +0800 Subject: [PATCH 3/4] Use less specific version of setup-ros Signed-off-by: Michael X. Grey --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 73385fc9..1664c221 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -34,7 +34,7 @@ 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 From 8465ad3974d9c75dca61dab22526def7acef5260 Mon Sep 17 00:00:00 2001 From: "Michael X. Grey" Date: Thu, 19 Dec 2024 17:32:52 +0800 Subject: [PATCH 4/4] Use less specific version of action-ros-ci Signed-off-by: Michael X. Grey --- .github/workflows/asan.yaml | 2 +- .github/workflows/build.yaml | 2 +- .github/workflows/tsan.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/asan.yaml b/.github/workflows/asan.yaml index b003c61b..0d70c967 100644 --- a/.github/workflows/asan.yaml +++ b/.github/workflows/asan.yaml @@ -19,7 +19,7 @@ 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 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1664c221..63de1253 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -38,7 +38,7 @@ jobs: 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 diff --git a/.github/workflows/tsan.yaml b/.github/workflows/tsan.yaml index ed9df5ab..cc3ab65e 100644 --- a/.github/workflows/tsan.yaml +++ b/.github/workflows/tsan.yaml @@ -17,7 +17,7 @@ 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: jazzy