Skip to content

Commit 2db40c1

Browse files
authored
Merge branch 'master' into fix/small_bugfixes
2 parents c737821 + cd73e83 commit 2db40c1

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

.github/workflows/ros_build.yaml

+5-11
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ jobs:
1616
matrix:
1717
ros_distribution:
1818
- humble
19-
- iron
19+
- jazzy
2020
- rolling
2121
include:
2222
# Humble Hawksbill (May 2022 - May 2027)
2323
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
2424
ros_distribution: humble
2525
ros_version: 2
26-
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-iron-ros-base-latest
27-
ros_distribution: iron
26+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-ros-base-latest
27+
ros_distribution: jazzy
2828
ros_version: 2
2929
# Rolling Ridley (June 2020 - Present)
30-
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
30+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-ros-base-latest
3131
ros_distribution: rolling
3232
ros_version: 2
3333
container:
@@ -37,15 +37,9 @@ jobs:
3737
uses: actions/checkout@v2
3838
with:
3939
submodules: recursive
40-
- name: Setup Rust
41-
uses: actions-rs/toolchain@v1
42-
with:
43-
toolchain: 1.79.0
44-
profile: minimal
45-
override: true
4640
- name: build and test
4741
uses: ros-tooling/action-ros-ci@master
4842
with:
4943
target-ros2-distro: ${{ matrix.ros_distribution }}
5044
vcs-repo-file-url: ""
51-
skip-tests: true
45+
skip-tests: true

docker/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ RUN pip install 'numpy<2.0.0'
2020
WORKDIR /ros2_ws
2121

2222
# Clone the repository with submodules
23-
#RUN git clone --recurse-submodules https://github.com/abizovnuralem/go2_ros2_sdk src
24-
ADD . /ros2_ws/src
23+
COPY . /ros2_ws/src
2524

2625
# Install Python requirements (with numpy constraint)
2726
RUN cd src && pip install -r requirements.txt

docker/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ services:
1818
privileged: true # Required for hardware access
1919
devices:
2020
- /dev/input:/dev/input # For joystick access
21-
restart: unless-stopped
21+
restart: unless-stopped

0 commit comments

Comments
 (0)