Skip to content

Commit 746ee8d

Browse files
authored
Add Jazzy and remove Iron from CI (#112)
Signed-off-by: Michael X. Grey <[email protected]>
1 parent 9c7747d commit 746ee8d

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

.github/workflows/asan.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: asan
1010
runs-on: ubuntu-22.04
1111
container:
12-
image: osrf/ros:iron-desktop-jammy
12+
image: osrf/ros:jazzy-desktop-noble
1313
steps:
1414
- name: create_blacklist
1515
run: |
@@ -19,12 +19,12 @@ jobs:
1919
- name: install_clang_and_tools
2020
run: sudo apt update && sudo apt install -y clang clang-tools lld wget python3-pip python3-colcon-coveragepy-result python3-colcon-lcov-result lcov
2121
- name: build_and_test
22-
uses: ros-tooling/action-ros-ci@0.3.5
22+
uses: ros-tooling/action-ros-ci@v0.3
2323
env:
2424
CC: clang -fsanitize-blacklist=${{ github.workspace }}/blacklist.txt
2525
CXX: clang++ -fsanitize-blacklist=${{ github.workspace }}/blacklist.txt
2626
with:
27-
target-ros2-distro: iron
27+
target-ros2-distro: jazzy
2828
# build all packages listed in the meta package
2929
package-name: |
3030
rmf_traffic
@@ -40,13 +40,13 @@ jobs:
4040
}
4141
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
4242
- name: Upload failed test results
43-
uses: actions/upload-artifact@v2
43+
uses: actions/upload-artifact@v4
4444
if: failure()
4545
with:
4646
name: test-results
4747
path: ros_ws/build/*/test_results/*/*.catch2.xml
4848
- name: upload_test_stream
49-
uses: actions/upload-artifact@v2
49+
uses: actions/upload-artifact@v4
5050
with:
5151
name: colcon-test-logs
5252
path: ${{ steps.build_and_test.outputs.ros-workspace-directory-name }}/log

.github/workflows/build.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ jobs:
1313
matrix:
1414
ros_distribution:
1515
- humble
16-
- iron
16+
- jazzy
1717
- rolling
1818
include:
1919
# Humble Hawksbill (May 2022 - May 2027)
2020
- ubuntu_distribution: jammy
2121
ros_distribution: humble
2222
ros_version: 2
23-
# Iron Irwini (May 2023 - November 2024)
24-
- ubuntu_distribution: jammy
25-
ros_distribution: iron
23+
# Jazzy Jalisco (May 2024 - May 2029)
24+
- ubuntu_distribution: noble
25+
ros_distribution: jazzy
2626
ros_version: 2
2727
# Rolling Ridley (No End-Of-Life)
28-
- ubuntu_distribution: jammy
28+
- ubuntu_distribution: noble
2929
ros_distribution: rolling
3030
ros_version: 2
3131
container:
@@ -34,11 +34,11 @@ jobs:
3434
- name: pwd
3535
run: pwd
3636
- name: setup ROS environment
37-
uses: ros-tooling/setup-ros@0.7.1
37+
uses: ros-tooling/setup-ros@v0.7
3838
with:
3939
required-ros-distributions: ${{ matrix.ros_distribution }}
4040
- name: build
41-
uses: ros-tooling/action-ros-ci@0.3.5
41+
uses: ros-tooling/action-ros-ci@v0.3
4242
with:
4343
target-ros2-distro: ${{ matrix.ros_distribution }}
4444
# build all packages listed in the meta package
@@ -54,7 +54,7 @@ jobs:
5454
}
5555
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
5656
- name: Upload failed test results
57-
uses: actions/upload-artifact@v2
57+
uses: actions/upload-artifact@v4
5858
if: failure()
5959
with:
6060
name: test-results

.github/workflows/tsan.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ jobs:
99
name: tsan
1010
runs-on: ubuntu-22.04
1111
container:
12-
image: osrf/ros:iron-desktop-jammy
12+
image: osrf/ros:jazzy-desktop-noble
1313
steps:
1414
- name: install_clang_and_tools
1515
run: sudo apt update && sudo apt install -y clang clang-tools lld wget python3-pip python3-colcon-coveragepy-result python3-colcon-lcov-result lcov
1616
- name: tsan_build_test
1717
env:
1818
CC: clang
1919
CXX: clang++
20-
uses: ros-tooling/action-ros-ci@0.3.5
20+
uses: ros-tooling/action-ros-ci@v0.3
2121
id: tsan_build_test
2222
with:
23-
target-ros2-distro: iron
23+
target-ros2-distro: jazzy
2424
# build all packages listed in the meta package
2525
package-name: |
2626
rmf_traffic
@@ -35,13 +35,13 @@ jobs:
3535
}
3636
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
3737
- name: Upload failed test results
38-
uses: actions/upload-artifact@v2
38+
uses: actions/upload-artifact@v4
3939
if: failure()
4040
with:
4141
name: test-results
4242
path: ros_ws/build/*/test_results/*/*.catch2.xml
4343
- name: upload_test_stream
44-
uses: actions/upload-artifact@v2
44+
uses: actions/upload-artifact@v4
4545
with:
4646
name: colcon-test-logs
4747
path: ${{ steps.tsan_build_test.outputs.ros-workspace-directory-name }}/log

0 commit comments

Comments
 (0)