Skip to content

Commit

Permalink
Fix CI rosversion cmd missing (#626)
Browse files Browse the repository at this point in the history
* Fix CI rosversion cmd missing

* Add missing rospy dependency

* rospy dependency actually not missing

fixing workflow ordering

* Add rospy package again

* disabling melodic temporarily

Co-authored-by: Joel Moriana <joel.moriana@gmail.com>
  • Loading branch information
berndgassmann and joel-mb authored Jul 21, 2022
1 parent fd35a57 commit 1604eb5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
strategy:
matrix:
include:
- docker_image: melodic-robot
ros_distro: melodic
ros_python_version: 2
ros_version: 1
#- docker_image: melodic-robot
# ros_distro: melodic
# ros_python_version: 2
# ros_version: 1

- docker_image: noetic-robot
ros_distro: noetic
Expand All @@ -52,7 +52,9 @@ jobs:
fetch-depth: 1
submodules: true
- name: Setup
run: ./install_dependencies.sh
run: |
./install_dependencies.sh
sudo apt-get install --no-install-recommends -y python3-rospkg
- name: ROS2 Build, Test, Lint
if: ${{ matrix.ros_version == 2 }}
shell: bash
Expand All @@ -69,8 +71,8 @@ jobs:
cd $GITHUB_WORKSPACE/../catkin_ws/src
ln -s $GITHUB_WORKSPACE
cd ..
catkin init
source /opt/ros/$(rosversion -d)/setup.bash
catkin init
cd $GITHUB_WORKSPACE/../catkin_ws &&
catkin build --summarize --no-status --force-color
catkin run_tests --no-status --force-color && catkin_test_results
Expand Down
1 change: 1 addition & 0 deletions install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ if [ "$ROS_VERSION" = "2" ]; then
else
ADDITIONAL_PACKAGES="ros-$ROS_DISTRO-rviz
ros-$ROS_DISTRO-opencv-apps
ros-$ROS_DISTRO-rospy
ros-$ROS_DISTRO-rospy-message-converter
ros-$ROS_DISTRO-pcl-ros"
fi
Expand Down

0 comments on commit 1604eb5

Please sign in to comment.