Skip to content

Commit e79bb0c

Browse files
committed
move from catkin_make to catkin tools
1 parent a0b84c2 commit e79bb0c

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

.github/workflows/ros-build-test.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@ on:
55
branches: [ ubuntu24-ci ]
66
pull_request:
77
branches: [ ros-one-devel ]
8-
workflow_dispatch:
98

109
jobs:
1110
build:
1211

1312
strategy:
1413
fail-fast: false
15-
matrix:
16-
build_type: [ Release ]
1714

18-
# environment: regular Ubuntu with container
1915
runs-on: ubuntu-24.04
2016
container:
2117
image: ubuntu:24.04
@@ -39,7 +35,7 @@ jobs:
3935
curl -sSL https://ros.packages.techfak.net/gpg.key -o /etc/apt/keyrings/ros-one-keyring.gpg
4036
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/ros-one-keyring.gpg] https://ros.packages.techfak.net $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/ros1.list
4137
apt-get update
42-
apt-get install -y python3-rosdep
38+
apt-get install -y python3-rosdep python3-catkin-tools
4339
rosdep init
4440
echo "yaml https://ros.packages.techfak.net/ros-one.yaml one" | tee /etc/ros/rosdep/sources.list.d/1-ros-one.list
4541
rosdep update
@@ -85,11 +81,13 @@ jobs:
8581
# rsync -a tmp/microsoft/onnxruntime-linux-x64-1.7.0/lib/ /usr/local/lib
8682
# rsync -a src/ocs2/ocs2_mpcnet/ocs2_mpcnet_core/misc/onnxruntime/cmake/ /usr/local/share/onnxruntime
8783

88-
- name: Build (${{ matrix.build_type }})
84+
- name: Build Release
8985
shell: bash
9086
run: |
9187
source /opt/ros/one/setup.bash
92-
catkin_make_isolated --use-ninja --merge --only-pkg-with-deps ocs2_legged_robot_ros ocs2_self_collision_visualization --cmake-args -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
88+
catkin init
89+
ctking config --cmake-args -DCMAKE_BUILD_TYPE=Release
90+
catkin build ocs2_legged_robot_ros ocs2_self_collision_visualization
9391
9492
# - name: Test
9593
# shell: bash

0 commit comments

Comments
 (0)