Skip to content

Commit

Permalink
Update the dependecies and CI configuration
Browse files Browse the repository at this point in the history
Fix #None
  • Loading branch information
Minggang Wang committed Aug 12, 2019
1 parent 2fef243 commit 3642797
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ branches:
- master

before_install:
- sudo docker pull ubuntu:xenial
- sudo docker pull ubuntu:bionic
- sudo docker build -t rcldocker .

script:
Expand Down
20 changes: 10 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
FROM ubuntu:xenial
FROM ubuntu:bionic

ENV GIT_USER_NAME mrbuild
ENV GIT_USER_EMAIL [email protected]
ENV LANG en_US.UTF-8

RUN apt-get update && apt-get install -y git wget curl locales python
RUN apt update && apt install -y git locales python curl wget
RUN locale-gen en_US en_US.UTF-8 && update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8

RUN /bin/bash -c 'echo "deb http://packages.ros.org/ros/ubuntu xenial main" > /etc/apt/sources.list.d/ros-latest.list' \
&& apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116
ENV LANG en_US.UTF-8

RUN apt install -y gnupg2 lsb-release
RUN curl http://repo.ros2.org/repos.key | apt-key add -
RUN curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | apt-key add -
RUN sh -c 'echo "deb [arch=amd64,arm64] http://packages.ros.org/ros2/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/ros2-latest.list'

# Install prerequisites
Expand All @@ -38,13 +35,16 @@ RUN git config --global user.name $GIT_USER_NAME \
ENV ROS2_WS=/root
WORKDIR $ROS2_WS

RUN wget https://github.com/ros2/ros2/releases/download/release-crystal-20190408/ros2-crystal-20190408-linux-xenial-amd64.tar.bz2 \
&& tar xf ros2-crystal-20190408-linux-xenial-amd64.tar.bz2
RUN wget https://github.com/ros2/ros2/releases/download/release-dashing-20190806/ros2-dashing-20190806-linux-bionic-amd64.tar.bz2 \
&& tar xf ros2-dashing-20190806-linux-bionic-amd64.tar.bz2

# [Ubuntu 18.04]
RUN rosdep install --from-paths $ROS2_WS/ros2-linux/share --ignore-src --rosdistro dashing -y --skip-keys "console_bridge fastcdr fastrtps libopensplice67 libopensplice69 osrf_testing_tools_cpp poco_vendor rmw_connext_cpp rosidl_typesupport_connext_c rosidl_typesupport_connext_cpp rti-connext-dds-5.3.1 tinyxml_vendor tinyxml2_vendor urdfdom urdfdom_headers"

RUN echo "source $ROS2_WS/ros2-linux/local_setup.bash" >> $HOME/.bashrc

# Install nvm, Node.js and node-gyp
ENV NODE_VERSION v10.15.3
ENV NODE_VERSION v10.16.2
RUN wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash \
&& . $HOME/.nvm/nvm.sh \
&& nvm install $NODE_VERSION && nvm alias default $NODE_VERSION
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ before_build:
- appveyor DownloadFile https://github.com/ros2/choco-packages/releases/download/2017-04-04-1/tinyxml-usestl.2.6.2.nupkg
- appveyor DownloadFile https://github.com/ros2/choco-packages/releases/download/2018-06-12-1/tinyxml2.6.0.0.nupkg
- choco install -y -s c:\download\ asio eigen tinyxml-usestl tinyxml2
- appveyor DownloadFile https://github.com/ros2/ros2/releases/download/release-crystal-20190408/ros2-crystal-20190408-windows-release-amd64.zip
- 7z x -y "c:\download\ros2-crystal-20190408-windows-release-amd64.zip" -o"c:\" > nul
- appveyor DownloadFile https://github.com/ros2/ros2/releases/download/release-dashing-20190806/ros2-dashing-20190806-windows-release-amd64.zip
- 7z x -y "c:\download\ros2-dashing-20190806-windows-release-amd64.zip" -o"c:\" > nul
- setx -m OPENSSL_CONF C:\OpenSSL-Win64\bin\openssl.cfg
- set PATH=C:\OpenSSL-Win64\bin;%PATH%
- setx AMENT_PYTHON_EXECUTABLE "c:\Python37"
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
"puppeteer": "^1.2.0"
},
"dependencies": {
"commander": "^2.12.2",
"commander": "^3.0.0",
"debug": "^4.1.1",
"rclnodejs": "0.9.0",
"rclnodejs": "^0.10.1",
"uuid": "^3.1.0",
"ws": "^6.0.0"
"ws": "^7.1.1"
}
}

0 comments on commit 3642797

Please sign in to comment.