Skip to content

Commit f0da913

Browse files
committed
Fixed CI.
1 parent 58436e9 commit f0da913

3 files changed

Lines changed: 18 additions & 39 deletions

File tree

.github/workflows/pybind-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ name: Pybind
33
on:
44
push:
55
pull_request:
6-
branches:
6+
branches:
77
- main
88

99
jobs:
1010
build:
1111
strategy:
1212
matrix:
13-
os: [ ubuntu-22.04, ubuntu-20.04 ]
13+
os: [ ubuntu-24.04, ubuntu-22.04 ]
1414
runs-on: ${{ matrix.os }}
1515
steps:
1616
- uses: actions/checkout@v4

.github/workflows/ros-ci.yml

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,58 +7,37 @@ name: ROS
77
on:
88
push:
99
pull_request:
10-
branches:
10+
branches:
1111
- main
1212

1313
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1414
jobs:
15-
build-noetic:
16-
# The type of runner that the job will run on
17-
runs-on: ubuntu-20.04
18-
container:
19-
image: ros:noetic-robot
20-
steps:
21-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
22-
- uses: actions/checkout@v4
23-
- name: Install dependencies
24-
run: sudo apt-get update && sudo apt-get install -y git libasio-dev
25-
- name: Create catkin workspace
26-
run: mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
27-
- name: Copy code to catkin workspace
28-
run: cd /catkin_ws/src && git clone https://github.com/westonrobot/ugv_sdk.git
29-
- name: Run catkin_make
30-
run: cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make"
31-
32-
build-foxy:
15+
build-humble:
3316
# The type of runner that the job will run on
34-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-22.04
3518
container:
36-
image: ros:foxy
19+
image: ros:humble
3720
steps:
3821
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
3922
- uses: actions/checkout@v4
23+
with:
24+
path: /ros2_ws/src/scout_ugv_sdk
4025
- name: Install dependencies
4126
run: sudo apt-get update && sudo apt-get install -y git libasio-dev
42-
- name: Create colcon workspace
43-
run: mkdir -p /ros2_ws/src && cd /ros2_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash"
44-
- name: Copy code to colcon workspace
45-
run: cd /ros2_ws/src && git clone https://github.com/westonrobot/ugv_sdk.git
4627
- name: Run colcon build
4728
run: cd /ros2_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; colcon build"
48-
49-
build-humble:
29+
build-jazzy:
5030
# The type of runner that the job will run on
51-
runs-on: ubuntu-22.04
31+
runs-on: ubuntu-24.04
5232
container:
53-
image: ros:humble
33+
image: ros:jazzy
5434
steps:
5535
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
5636
- uses: actions/checkout@v4
37+
with:
38+
path: /ros2_ws/src/scout_ugv_sdk
5739
- name: Install dependencies
5840
run: sudo apt-get update && sudo apt-get install -y git libasio-dev
59-
- name: Create colcon workspace
60-
run: mkdir -p /ros2_ws/src && cd /ros2_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash"
61-
- name: Copy code to colcon workspace
62-
run: cd /ros2_ws/src && git clone https://github.com/westonrobot/ugv_sdk.git
6341
- name: Run colcon build
64-
run: cd /ros2_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; colcon build"
42+
run: cd /ros2_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; colcon build"
43+

.github/workflows/standalone-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ name: Cpp
33
on:
44
push:
55
pull_request:
6-
branches:
6+
branches:
77
- main
88

99
jobs:
1010
build:
1111
strategy:
1212
matrix:
13-
os: [ ubuntu-22.04, ubuntu-20.04 ]
13+
os: [ ubuntu-24.04, ubuntu-22.04 ]
1414
runs-on: ${{ matrix.os }}
1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: Install dependencies
1818
run: sudo apt-get install -y build-essential cmake libasio-dev
1919
- name: Build and pack
20-
run: mkdir build && cd build && cmake -DBUILD_TESTS=ON .. && cmake --build . && cpack
20+
run: mkdir build && cd build && cmake -DBUILD_TESTS=ON .. && cmake --build . && cpack

0 commit comments

Comments
 (0)