Skip to content

Commit c301b5c

Browse files
committed
Major fix to repo building, package deps, and setup scripts
1 parent 9d8924f commit c301b5c

File tree

12 files changed

+34
-15
lines changed

12 files changed

+34
-15
lines changed

.github/workflows/test.yaml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,33 @@ jobs:
55
runs-on: ubuntu-22.04
66
steps:
77
- uses: actions/checkout@v4
8-
- run: |
8+
- name: enviroment setupg
9+
run: |
910
export ROVERFLAKE_ROOT="${GITHUB_WORKSPACE}"
1011
yes | ./setup_scripts/setup_everything_common.sh
12+
- name: build
13+
run: |
14+
cd $ROVERFLAKE_ROOT
15+
echo $ROS_DISTRO
16+
source /opt/ros/humble/setup.bash
17+
echo $ROS_DISTRO
18+
colcon build --symlink-install
1119
- name: Notify Discord (success)
1220
if: ${{ success() }}
1321
uses: appleboy/[email protected]
1422
with:
15-
webhook_id: ${{ secrets.DISCORD_BOT_WEBHOOK_URL }} # it also accepts full URL
23+
webhook_id: ${{ secrets.DISCORD_BOT_WEBHOOK_ID }} # it also accepts full URL
24+
webhook_token: ${{ secrets.DISCORD_BOT_WEBHOOK_TOKEN }} # it also accepts full URL
1625
message: |
1726
:) ${{ github.repository }} on `${{ github.ref_name }}`
1827
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
19-
- name: Notify Discord (success)
28+
- name: Notify Discord (failure)
2029
if: ${{ failure() }}
2130
uses: appleboy/[email protected]
2231
with:
23-
webhook_id: ${{ secrets.DISCORD_BOT_WEBHOOK_URL }} # it also accepts full URL
32+
webhook_id: ${{ secrets.DISCORD_BOT_WEBHOOK_ID }} # it also accepts full URL
33+
webhook_token: ${{ secrets.DISCORD_BOT_WEBHOOK_TOKEN }} # it also accepts full URL
2434
message: |
2535
_you have saddened me ${{ github.actor }}_
26-
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
36+
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
37+

setup_scripts/setup_everything_common.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ echo Will install ros2 humble, vscode, btop, tmux and other useful tools.
2323
echo This script will NOT install discord. run install-discord.sh if you want discord.
2424
sleep 1.0
2525
echo starting with ros2...
26-
exit 1
2726

2827
#sudo apt update
2928
cd $ROVERFLAKE_ROOT/setup_scripts/
@@ -63,7 +62,7 @@ source /opt/ros/humble/setup.bash
6362
#install ros2 packages
6463
sudo rosdep init
6564
rosdep update
66-
rosdep install --from-paths src -y --ignore-src
65+
rosdep install --from-paths src -y --ignore-src --skip-keys="serial"
6766
# for package in "${ros_packages_to_install[@]}"; do
6867
# if is_package_installed "$package"; then
6968
# echo "Package '$package' is already installed."

src/arm_control/package.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
<exec_depend>robot_state_publisher</exec_depend>
3939
<exec_depend>tf2_ros</exec_depend>
4040

41+
<depend>rover_utils</depend>
42+
<depend>moteus_msgs</depend>
43+
44+
4145
<test_depend>ament_cmake_gtest</test_depend>
4246
<test_depend>ament_lint_auto</test_depend>
4347
<test_depend>ament_lint_common</test_depend>

src/arm_hardware_interface/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<depend>arm_control</depend>
2020

2121
<!-- Rosdep fails with the following: -->
22-
<!-- <depend>serial</depend> -->
22+
<depend>serial</depend>
2323

2424
<export>
2525
<build_type>ament_cmake</build_type>

src/cameras_cpp/package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<license>TODO: License declaration</license>
99

1010
<buildtool_depend>ament_cmake</buildtool_depend>
11+
<!-- <depend>rover_utils</depend> -->
12+
<build_export_depend>rover_utils</build_export_depend>
1113

1214
<test_depend>ament_lint_auto</test_depend>
1315
<test_depend>ament_lint_common</test_depend>

src/rover_hmi/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.8)
1+
cmake_minimum_required(VERSION 3.10)
22
project(rover_hmi)
33

44
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")

src/rover_launchers/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.8)
1+
cmake_minimum_required(VERSION 3.10)
22
project(rover_launchers)
33

44
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")

src/rover_manager/package.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414

1515
<depend>rclcpp</depend>
1616
<depend>rover_msgs</depend>
17-
18-
19-
17+
<build_export_depend>serial</build_export_depend>
18+
<build_export_depend>rover_utils</build_export_depend>
2019

2120
<export>
2221
<build_type>ament_cmake</build_type>

src/rover_samples/rv_sample_package/package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<test_depend>ament_lint_auto</test_depend>
1313
<test_depend>ament_lint_common</test_depend>
1414

15+
<build_export_depend>rover_utils</build_export_depend>
16+
1517
<depend>rclcpp</depend>
1618
<depend>sensor_msgs</depend>
1719

src/rover_sounds/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.8)
1+
cmake_minimum_required(VERSION 3.10)
22
project(rover_sounds)
33

44
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")

0 commit comments

Comments
 (0)