From 4c89e23581437e63172de4bca0c83d5651f45630 Mon Sep 17 00:00:00 2001 From: Ruixiang Du Date: Fri, 23 Oct 2020 17:07:00 +0800 Subject: [PATCH] ci: removed requirements for higher version of cmake --- .gitlab-ci.yml | 24 ++++++++++++------------ README.md | 30 +----------------------------- 2 files changed, 13 insertions(+), 41 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f4508d..abc0cd2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,8 +34,8 @@ kinetic-catkin-build: - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace" - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk - cd /catkin_ws/src/wrp_sdk && git submodule update --init --recursive - # - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/scout_base.git - # - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/hunter_base.git + - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/scout_base.git + - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/hunter_base.git - cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make" kinetic-catkin-isolated-build: @@ -45,8 +45,8 @@ kinetic-catkin-isolated-build: - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace" - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk - cd /catkin_ws/src/wrp_sdk && git submodule update --init --recursive - # - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/scout_base.git - # - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/hunter_base.git + - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/scout_base.git + - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/hunter_base.git - cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make_isolated --install" melodic-catkin-build: @@ -56,8 +56,8 @@ melodic-catkin-build: - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace" - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk - cd /catkin_ws/src/wrp_sdk && git submodule update --init --recursive - # - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/scout_base.git - # - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/hunter_base.git + - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/scout_base.git + - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/hunter_base.git - cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make" melodic-catkin-isolated-build: @@ -67,8 +67,8 @@ melodic-catkin-isolated-build: - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace" - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk - cd /catkin_ws/src/wrp_sdk && git submodule update --init --recursive - # - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/scout_base.git - # - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/hunter_base.git + - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/scout_base.git + - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/hunter_base.git - cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make_isolated --install" noetic-catkin-build: @@ -78,8 +78,8 @@ noetic-catkin-build: - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace" - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk - cd /catkin_ws/src/wrp_sdk && git submodule update --init --recursive - # - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/scout_base.git - # - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/hunter_base.git + - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/scout_base.git + - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/hunter_base.git - cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make" noetic-catkin-isolated-build: @@ -89,6 +89,6 @@ noetic-catkin-isolated-build: - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace" - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk - cd /catkin_ws/src/wrp_sdk && git submodule update --init --recursive - # - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/scout_base.git - # - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/hunter_base.git + - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/scout_base.git + - cd /catkin_ws/src && git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/westonrobot/ros/hunter_base.git - cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make_isolated --install" \ No newline at end of file diff --git a/README.md b/README.md index be25bed..2594560 100755 --- a/README.md +++ b/README.md @@ -31,37 +31,9 @@ Generally, you only need to instantiate an object of the robot base class (such ### Install dependent libraries -You will need to upgrade CMake to v3.13.0 or later. You can follow the [offical instructions](https://apt.kitware.com/). Here is a brief summary: - ``` $ sudo apt-get update -$ sudo apt-get install apt-transport-https ca-certificates gnupg software-properties-common wget -$ wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null -``` - -Ubuntu 20.04 - -``` -$ sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' -``` - -Ubuntu 18.04 - -``` -$ sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' -``` - -Ubuntu 16.04 - -``` -$ sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main' -``` - -``` -$ sudo apt-get update -$ sudo apt-get install kitware-archive-keyring -$ sudo rm /etc/apt/trusted.gpg.d/kitware.gpg -$ sudo apt-get install cmake +$ sudo apt-get install build-essential git cmake ``` ### I. Use the package with ROS