diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abc0cd2..42c231c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,6 @@ kinetic-catkin-build: - 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 && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make" kinetic-catkin-isolated-build: @@ -46,7 +45,6 @@ kinetic-catkin-isolated-build: - 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 && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make_isolated --install" melodic-catkin-build: @@ -57,7 +55,6 @@ melodic-catkin-build: - 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 && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make" melodic-catkin-isolated-build: @@ -68,7 +65,6 @@ melodic-catkin-isolated-build: - 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 && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make_isolated --install" noetic-catkin-build: @@ -79,7 +75,6 @@ noetic-catkin-build: - 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 && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make" noetic-catkin-isolated-build: @@ -90,5 +85,4 @@ noetic-catkin-isolated-build: - 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 && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make_isolated --install" \ No newline at end of file