Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Commit

Permalink
Replace 'coupe19' with 'coupe20'
Browse files Browse the repository at this point in the history
  • Loading branch information
paulMConstant committed Nov 2, 2019
1 parent 2dc24f3 commit 612c5da
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- docker

install:
- docker pull utcoupe/coupe19:utcoupe-ros-kinetic-amd64
- docker pull utcoupe/coupe20:utcoupe-ros-kinetic-amd64

script:
- source scripts/run_travis_build.sh
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ Source code of UTCoupe 2020
=======
|master|devel|
|------|-----|
| [![Build Status](https://travis-ci.org/utcoupe/coupe19.svg?branch=master)](https://travis-ci.org/utcoupe/coupe19) | [![Build Status](https://travis-ci.org/utcoupe/coupe19.svg?branch=devel)](https://travis-ci.org/utcoupe/coupe19) |
| [![Build Status](https://travis-ci.org/utcoupe/coupe20.svg?branch=master)](https://travis-ci.org/utcoupe/coupe20) | [![Build Status](https://travis-ci.org/utcoupe/coupe20.svg?branch=devel)](https://travis-ci.org/utcoupe/coupe20) |

# Configuration

First clone the repo to your PC :
```
git clone [email protected]:utcoupe/coupe19.git
git clone [email protected]:utcoupe/coupe20.git
```

### Development environment configuration
Expand All @@ -24,7 +24,7 @@ If it is your first installation, answer "y" to all questions.

The whole system relies on ROS (http://www.ros.org/). Therefore you need to compile the system after having fetched it :
```
cd coupe19/ros_ws
cd coupe20/ros_ws
catkin_make
```

Expand Down
6 changes: 3 additions & 3 deletions arduino/pr/arduino_tower/draft/ros_launch_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
echo `cd` ;
sleep 5 ;

#$alias cdRos= `cd ~/Documents/coupe19/arduino_tower`
#$alias cdRos= `cd ~/Documents/coupe20/arduino_tower`
#$cdRos

# cd ~/Documents
# echo "Test "
#
# gnome-terminal -- /bin/bash -c 'ls; read'
# #gnome-terminal -- /Documents/coupe19 -c 'ls; read'
# gnome-terminal -- 'cd coupe19'
# #gnome-terminal -- /Documents/coupe20 -c 'ls; read'
# gnome-terminal -- 'cd coupe20'
# #gnome-terminal -e sleep 50

4 changes: 2 additions & 2 deletions cross-compilation/run_compilation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function run_cross_compilation() {
if [[ -z "$(docker images --format='{{print .Tag}}' | grep ${img_tag})" ]]; then
red_echo "docker image ${img_tag} not found locally."
if [[ ${build_image} -eq 0 ]]; then
docker pull "utcoupe/coupe19:${img_tag}"
docker pull "utcoupe/coupe20:${img_tag}"
else
build_image
fi
Expand All @@ -52,7 +52,7 @@ function run_cross_compilation() {
--mount type=bind,source="${UTCOUPE_WORKSPACE}"/ros_ws/src,target="${img_ws_root_dir}"/ros_ws/src \
--mount type=bind,source="${UTCOUPE_WORKSPACE}"/libs,target="${img_ws_root_dir}"/libs,readonly \
--mount type=bind,source="${cross_compilation_install_dir}",target="${img_ws_root_dir}"/ros_ws/install \
"utcoupe/coupe19:${img_tag}" \
"utcoupe/coupe20:${img_tag}" \
/bin/bash -c "catkin_make install -DCMAKE_BUILD_TYPE=Release"
# Makes cmake crash
# --tmpfs "${img_ws_root_dir}"/ros_ws/devel
Expand Down
2 changes: 1 addition & 1 deletion cross-compilation/utcoupe-ros-kinetic-amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ros:kinetic-ros-base-xenial

ENV UTCOUPE_WORKSPACE /utcoupe/coupe19
ENV UTCOUPE_WORKSPACE /utcoupe/coupe20
RUN mkdir -p $UTCOUPE_WORKSPACE/ros_ws/src
ENV ROS_LANG_DISABLE=genlisp:geneus

Expand Down
4 changes: 2 additions & 2 deletions cross-compilation/utcoupe-ros-melodic-amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ros:melodic-ros-base-bionic

ENV UTCOUPE_WORKSPACE /utcoupe/coupe19
ENV UTCOUPE_WORKSPACE /utcoupe/coupe20
RUN mkdir -p $UTCOUPE_WORKSPACE/ros_ws/src
ENV ROS_LANG_DISABLE=genlisp:geneus

Expand All @@ -11,7 +11,7 @@ RUN rm -rf /var/lib/apt/lists/*

RUN mkdir -p /temp/utcoupe_install
WORKDIR /temp/utcoupe_install
RUN wget https://github.com/utcoupe/coupe19/raw/master/scripts/install_external_nodes.sh && chmod +x install_external_nodes.sh
RUN wget https://github.com/utcoupe/coupe20/raw/master/scripts/install_external_nodes.sh && chmod +x install_external_nodes.sh
RUN bash -c "source /opt/ros/melodic/setup.sh && ./install_external_nodes.sh"
RUN rm -rf /tmp/utcoupe*

Expand Down
6 changes: 3 additions & 3 deletions scripts/run_travis_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ echo "--> final command : $COMPILE_COMMAND"

docker run \
-i \
--mount type=bind,source="$(pwd)"/ros_ws/src,target=/utcoupe/coupe19/ros_ws/src \
--mount type=bind,source="$(pwd)"/libs,target=/utcoupe/coupe19/libs,readonly \
utcoupe/coupe19:utcoupe-ros-kinetic-amd64 \
--mount type=bind,source="$(pwd)"/ros_ws/src,target=/utcoupe/coupe20/ros_ws/src \
--mount type=bind,source="$(pwd)"/libs,target=/utcoupe/coupe20/libs,readonly \
utcoupe/coupe20:utcoupe-ros-kinetic-amd64 \
/bin/bash -c "$COMPILE_COMMAND"

0 comments on commit 612c5da

Please sign in to comment.