Skip to content

Commit b365986

Browse files
committed
more r2s_gw removal
1 parent 73b6796 commit b365986

File tree

2 files changed

+2
-33
lines changed

2 files changed

+2
-33
lines changed

.github/workflows/debian-packages.yml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ jobs:
151151
ls -la debian_packages/${{ matrix.ros_distro }}/
152152
153153
# Install the debian packages on top of ros-core
154-
apt-get install -y ./debian_packages/${{ matrix.ros_distro }}/ros-${{ matrix.ros_distro }}-greenwave-monitor-interfaces_*.deb ./debian_packages/${{ matrix.ros_distro }}/ros-${{ matrix.ros_distro }}-greenwave-monitor_*.deb ./debian_packages/${{ matrix.ros_distro }}/ros-${{ matrix.ros_distro }}-r2s-gw_*.deb
154+
apt-get install -y ./debian_packages/${{ matrix.ros_distro }}/ros-${{ matrix.ros_distro }}-greenwave-monitor-interfaces_*.deb ./debian_packages/${{ matrix.ros_distro }}/ros-${{ matrix.ros_distro }}-greenwave-monitor_*.deb
155155
156156
# Verify packages are installed
157-
dpkg -s ros-${{ matrix.ros_distro }}-r2s-gw ros-${{ matrix.ros_distro }}-greenwave-monitor ros-${{ matrix.ros_distro }}-greenwave-monitor-interfaces
157+
dpkg -s ros-${{ matrix.ros_distro }}-greenwave-monitor ros-${{ matrix.ros_distro }}-greenwave-monitor-interfaces
158158
shell: bash
159159
env:
160160
DEBIAN_FRONTEND: noninteractive
@@ -202,26 +202,6 @@ jobs:
202202
kill -9 "$(cat /tmp/gwm_ncurses.pid)" 2>/dev/null || true
203203
shell: bash
204204

205-
- name: Install Python dependencies for r2s_gw
206-
run: |
207-
# Install Python dependencies (only needed for r2s_gw, not ncurses)
208-
apt-get install -y python3-pip || true
209-
if [[ "${{ matrix.ros_distro }}" == "jazzy" || \
210-
"${{ matrix.ros_distro }}" == "kilted" || \
211-
"${{ matrix.ros_distro }}" == "rolling" ]]; then
212-
python3 -m pip install -I textual --break-system-packages
213-
else
214-
python3 -m pip install textual
215-
fi
216-
shell: bash
217-
218-
- name: Test r2s_gw execution
219-
run: |
220-
source /opt/ros/${{ matrix.ros_distro }}/setup.bash
221-
timeout 10s bash -lc "script -qfec 'ros2 run r2s_gw r2s_gw' /dev/null <<< \$'q'" || true
222-
timeout 10s bash -lc "script -qfec 'ros2 run greenwave_monitor r2s_gw_dashboard' /dev/null <<< \$'q'" || true
223-
shell: bash
224-
225205
- name: Test greenwave_monitor execution
226206
run: |
227207
source /opt/ros/${{ matrix.ros_distro }}/setup.bash

.github/workflows/ros-tests.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,6 @@ jobs:
9393
env:
9494
DEBIAN_FRONTEND: noninteractive
9595

96-
- name: Install Python dependencies
97-
run: |
98-
if [[ "${{ matrix.ros_distro }}" == "jazzy" || \
99-
"${{ matrix.ros_distro }}" == "kilted" || \
100-
"${{ matrix.ros_distro }}" == "rolling" ]]; then
101-
pip3 install --break-system-packages textual
102-
else
103-
pip3 install textual
104-
fi
105-
shell: bash
106-
10796
- name: Build packages
10897
run: |
10998
source /opt/ros/${{ matrix.ros_distro }}/setup.bash

0 commit comments

Comments
 (0)