Skip to content

Commit 205f8c5

Browse files
committed
Update actions for Linux platform
1 parent c769edf commit 205f8c5

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

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

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

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424

2525
build:
2626
needs: identify-ros-distro
27-
runs-on: ${{ needs.identify-ros-distro.outputs.linuxos }}
27+
runs-on: ubuntu-latest
2828
container:
29-
image: osrf/ros:${{ needs.identify-ros-distro.outputs.distro }}-desktop
29+
image: ${{ needs.identify-ros-distro.outputs.linuxos }}
3030
strategy:
3131
fail-fast: false
3232
matrix:
@@ -39,6 +39,8 @@ jobs:
3939

4040
- name: Setup ROS2
4141
uses: ros-tooling/[email protected]
42+
with:
43+
required-ros-distributions: ${{ needs.identify-ros-distro.outputs.distro }}
4244

4345
- uses: actions/checkout@v4
4446

0 commit comments

Comments
 (0)