Skip to content

Commit 459b86e

Browse files
committed
Remove setup-ros actions
1 parent 205f8c5 commit 459b86e

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

.github/workflows/identify-ros-distro.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ jobs:
2727
run: |
2828
if ${ROLLING_VAR} == true; then
2929
echo "::set-output name=distro::rolling"
30-
echo "::set-output name=linuxos::ubuntu:noble"
30+
echo "::set-output name=linuxos::ubuntu:24.04"
3131
elif ${JAZZY_VAR} == true; then
3232
echo "::set-output name=distro::jazzy"
33-
echo "::set-output name=linuxos::ubuntu:noble"
33+
echo "::set-output name=linuxos::ubuntu:24.04"
3434
elif ${IRON_VAR} == true; then
3535
echo "::set-output name=distro::iron"
36-
echo "::set-output name=linuxos::ubuntu:jammy"
36+
echo "::set-output name=linuxos::ubuntu:22.04"
3737
elif ${HUMBLE_VAR} == true; then
3838
echo "::set-output name=distro::humble"
39-
echo "::set-output name=linuxos::ubuntu:jammy"
39+
echo "::set-output name=linuxos::ubuntu:22.04"
4040
else
4141
echo "Unable to map branch name to ROS distro, using ROLLING as default"
4242
echo "::set-output name=distro::rolling"
43-
echo "::set-output name=linuxos::ubuntu-24.04"
43+
echo "::set-output name=linuxos::ubuntu:24.04"
4444
fi

.github/workflows/linux-build-and-test.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
needs: identify-ros-distro
2727
runs-on: ubuntu-latest
2828
container:
29-
image: ${{ needs.identify-ros-distro.outputs.linuxos }}
29+
image: osrf/ros:${{ needs.identify-ros-distro.outputs.distro }}-desktop-full
3030
strategy:
3131
fail-fast: false
3232
matrix:
@@ -37,11 +37,6 @@ jobs:
3737
with:
3838
node-version: ${{ matrix.node-version }}
3939

40-
- name: Setup ROS2
41-
uses: ros-tooling/[email protected]
42-
with:
43-
required-ros-distributions: ${{ needs.identify-ros-distro.outputs.distro }}
44-
4540
- uses: actions/checkout@v4
4641

4742
- name: Build and test rclnodejs

0 commit comments

Comments
 (0)