Skip to content

Commit b46b416

Browse files
committed
update GithubAction for ros-one noble
1 parent f34810d commit b46b416

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

.github/workflows/config.yml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ jobs:
2020
- ROS_DISTRO: one
2121
PYTHON_EXECUTABLE: python3
2222
DOCKER_IMAGE: ubuntu:22.04
23-
ROS_REPOSITORY_URL: https://raw.githubusercontent.com/k-okada/ros-o-builder/jammy-one-unstable/repository
23+
- ROS_DISTRO: one
24+
PYTHON_EXECUTABLE: python3
25+
DOCKER_IMAGE: ubuntu:24.04
2426
- ROS_DISTRO: melodic
2527
PYTHON_EXECUTABLE: python
2628
USE_SOURCE_SMACH_ROS: true
@@ -33,7 +35,6 @@ jobs:
3335
PYTHON_EXECUTABLE: python3
3436
USE_SOURCE_SMACH_ROS: true
3537
DOCKER_IMAGE: ubuntu:22.04
36-
ROS_REPOSITORY_URL: https://raw.githubusercontent.com/k-okada/ros-o-builder/jammy-one-unstable/repository
3738

3839
container:
3940
image: ${{ matrix.DOCKER_IMAGE }}
@@ -42,7 +43,7 @@ jobs:
4243

4344
steps:
4445
- name: Setup ROS-O deb repository
45-
if: ${{ matrix.DOCKER_IMAGE == 'ubuntu:22.04' }}
46+
if: ${{ matrix.ROS_DISTRO == 'one' }}
4647
run: apt update -y -qq && apt install -y -qq sudo
4748

4849
- name: Update apt packages
@@ -62,19 +63,16 @@ jobs:
6263
uses: actions/checkout@v4
6364

6465
- name: Setup ROS-O deb repository
65-
if: ${{ matrix.ROS_REPOSITORY_URL }}
66+
if: ${{ matrix.ROS_DISTRO == 'one' }}
6667
run: |
6768
set -x
68-
apt install -qq -y ca-certificates
69-
echo "deb [trusted=yes] ${{ matrix.ROS_REPOSITORY_URL }}/ ./" | tee /etc/apt/sources.list.d/ros-o-builder.list
69+
apt install -qq -y ca-certificates lsb-release
70+
echo "deb [trusted=yes] https://ros.packages.techfak.net $(lsb_release -cs)-testing main" | tee /etc/apt/sources.list.d/ros-o-builder.list
7071
apt update
71-
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -qq -y python3-rosdep2
72-
echo "yaml ${{ matrix.ROS_REPOSITORY_URL }}/local.yaml debian" | tee /etc/ros/rosdep/sources.list.d/1-ros-o-builder.list
72+
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -qq -y python3-rosdep
73+
rosdep init
74+
echo "yaml https://ros.packages.techfak.net/ros-one.yaml ubuntu" | tee /etc/ros/rosdep/sources.list.d/1-ros-o-builder.list
7375
rosdep update
74-
#
75-
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y software-properties-common
76-
add-apt-repository -y ppa:k-okada/python3-catkin-tools
77-
apt update -y -qq
7876
7977
- name: Start X server
8078
run: |
@@ -90,9 +88,7 @@ jobs:
9088

9189
- name: Setup ROS
9290
run: |
93-
[ ${{ matrix.ROS_DISTRO }} = "one" ] && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -qq -y catkin
94-
[ ${{ matrix.ROS_DISTRO }} = "one" ] || sudo apt -y -qq install ${{ matrix.PYTHON_EXECUTABLE }}-rosdep ros-${{ matrix.ROS_DISTRO }}-catkin
95-
sudo apt -y -qq install ${{ matrix.PYTHON_EXECUTABLE }}-catkin-tools ros-${{ matrix.ROS_DISTRO }}-ros-environment make gcc g++
91+
sudo apt -y -qq install ${{ matrix.PYTHON_EXECUTABLE }}-catkin-tools ros-${{ matrix.ROS_DISTRO }}-catkin make gcc g++
9692
sudo apt -y -qq install ros-${{ matrix.ROS_DISTRO }}-roseus ros-${{ matrix.ROS_DISTRO }}-roseus-smach
9793
# ROS-O instaelled rosdep at 'Setup ROS-O deb repository'
9894
[ -e /etc/ros/rosdep/sources.list.d ] || (sudo rosdep init && rosdep update --include-eol-distros)

0 commit comments

Comments
 (0)