Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/identify-ros-distro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
value: ${{ jobs.identify-ros-distro.outputs.linuxos }}
env:
ROLLING_VAR: ${{ contains(github.ref, 'develop') }}
KILTED_VAR: ${{ contains(github.ref, 'kilted') }}
JAZZY_VAR: ${{ contains(github.ref, 'jazzy') }}
IRON_VAR: ${{ contains(github.ref, 'iron') }}
HUMBLE_VAR: ${{ contains(github.ref, 'humble') }}
Expand All @@ -28,6 +29,9 @@ jobs:
if ${ROLLING_VAR} == true; then
echo "::set-output name=distro::rolling"
echo "::set-output name=linuxos::ubuntu:24.04"
elif ${KILTED_VAR} == true; then
echo "::set-output name=distro::kilted"
echo "::set-output name=linuxos::ubuntu:24.04"
elif ${JAZZY_VAR} == true; then
echo "::set-output name=distro::jazzy"
echo "::set-output name=linuxos::ubuntu:24.04"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/linux-build-and-test-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
matrix:
node-version: [20.X, 22.X]
ros_distribution:
- kilted
- jazzy
- humble
- rolling
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/linux-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ on:
push:
branches:
- develop
- kilted
- jazzy
- humble-hawksbill
pull_request:
branches:
- develop
- kilted
- jazzy
- humble-hawksbill
workflow_dispatch:
Expand Down Expand Up @@ -41,6 +43,7 @@ jobs:
uses: ros-tooling/[email protected]
with:
required-ros-distributions: ${{ needs.identify-ros-distro.outputs.distro }}
use-ros2-testing: true

- name: Install test-msgs on Linux
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/windows-build-and-test-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
matrix:
node-version: [22.X]
ros_distribution:
- kilted
- jazzy
- humble
- rolling
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/windows-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ on:
push:
branches:
- develop
- kilted
- jazzy
- humble-hawksbill
pull_request:
branches:
- develop
- kilted
- jazzy
- humble-hawksbill
workflow_dispatch:
Expand All @@ -34,6 +36,7 @@ jobs:
uses: ros-tooling/[email protected]
with:
required-ros-distributions: ${{ needs.identify-ros-distro.outputs.distro }}
use-ros2-testing: true

- name: Install ROS2 Rolling (Conditional)
if: ${{ needs.identify-ros-distro.outputs.distro == 'rolling' }}
Expand All @@ -60,4 +63,4 @@ jobs:
run: |
call "c:\dev\${{ needs.identify-ros-distro.outputs.distro }}\ros2-windows\setup.bat"
cmd /c "if ${{ needs.identify-ros-distro.outputs.distro }}==foxy (set RMW_IMPLEMENTATION=rmw_cyclonedds_cpp&&npm test)"
cmd /c "if NOT ${{ needs.identify-ros-distro.outputs.distro }}==foxy if NOT ${{ needs.identify-ros-distro.outputs.distro }}==rolling (npm test)"
cmd /c "if NOT ${{ needs.identify-ros-distro.outputs.distro }}==foxy if NOT ${{ needs.identify-ros-distro.outputs.distro }}==rolling if NOT ${{ needs.identify-ros-distro.outputs.distro }}==kilted (npm test)"
2 changes: 2 additions & 0 deletions lib/distro.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const DistroId = {
HUMBLE: 2205,
IRON: 2305,
JAZZY: 2405,
KILTED: 2505,
ROLLING: 5000,
};

Expand All @@ -35,6 +36,7 @@ DistroNameIdMap.set('galactic', DistroId.GALACTIC);
DistroNameIdMap.set('humble', DistroId.HUMBLE);
DistroNameIdMap.set('iron', DistroId.IRON);
DistroNameIdMap.set('jazzy', DistroId.JAZZY);
DistroNameIdMap.set('kilted', DistroId.KILTED);
DistroNameIdMap.set('rolling', DistroId.ROLLING);

const DistroUtils = {
Expand Down
2 changes: 1 addition & 1 deletion test/test-distro.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe('rclnodejs distro utils', function () {
);
assert.equal(
distroNames.length,
7,
8,
'Incorrect number of known distro names'
);

Expand Down
Loading