Skip to content

Commit 62a56df

Browse files
author
Minggang Wang
committed
Create foxy-fitzroy branch
This patch makes changes: - Upgrade to Ubuntu 20.04 (focal) on travis. - Upgrade to macOS 10.15.4 on circleci. - Sync with instructions to install Foxy, see details: https://index.ros.org/doc/ros2/Installation/Foxy/ - Add the cases used to test interactions with rclpy/rclcpp clients to black list, because those become more flaky on CI platforms. Fix #None
1 parent 3e93c48 commit 62a56df

File tree

5 files changed

+27
-34
lines changed

5 files changed

+27
-34
lines changed

.circleci/config.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
99
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
1010
macos:
11-
xcode: 11.1.0
11+
xcode: 11.5.0
1212
steps:
1313
- checkout
1414
- run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
@@ -18,18 +18,16 @@ jobs:
1818
# fallback to using the latest cache if no exact match is found
1919
- v1-dependencies-
2020
- run: brew update
21-
# Pin tinyxml2 to 7.0.0
22-
- run: brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/9ec55dd6f30fa2a77dfd0367cff671c9c8828f67/Formula/tinyxml2.rb
23-
- run: brew install wget cmake cppcheck tinyxml eigen pcre poco
21+
- run: brew install wget cmake cppcheck tinyxml eigen pcre poco tinyxml2
2422
- run: brew install openssl
2523
- run: brew install asio console_bridge log4cxx spdlog
26-
- run: python3 -m pip install catkin_pkg empy git+https://github.com/lark-parser/[email protected] pyparsing pyyaml setuptools argcomplete colcon-common-extensions numpy
27-
- run: mkdir -p ~/ros2_install && cd ~/ros2_install && wget https://ci.ros2.org/view/packaging/job/packaging_osx/lastSuccessfulBuild/artifact/ws/ros2-package-osx-x86_64.tar.bz2 && tar xf ros2-package-osx-x86_64.tar.bz2
28-
- run: wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash
24+
- run: python3 -m pip install catkin_pkg empy ifcfg lark-parser lxml netifaces numpy pyparsing pyyaml setuptools argcomplete colcon-common-extensions
25+
- run: mkdir -p ~/ros2_install && cd ~/ros2_install && wget https://github.com/ros2/ros2/releases/download/release-foxy-20200605/ros2-foxy-20200605-macos-amd64.tar.bz2 && tar xf ros2-foxy-20200605-macos-amd64.tar.bz2
26+
- run: wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
2927
- run: echo "source $HOME/.bashrc" >> ~/.bash_profile
3028
- run: cat ~/.bash_profile
31-
- run: nvm install v12.16.1
32-
- run: nvm alias default v12.16.1
29+
- run: nvm install v12.18.0
30+
- run: nvm alias default v12.18.0
3331
- run: node --version && npm --version && rm -rf ./node_modules/
3432
- run: source ~/ros2_install/ros2-osx/local_setup.bash && git submodule init && git submodule update && npm install --python=python2.7
3533
- run: export PATH="/usr/local/opt/python@2/libexec/bin:$PATH" && npm run lint

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ sudo: required
55

66
branches:
77
only:
8-
- develop
9-
- master
8+
- foxy-fitzroy
109

1110
before_install:
12-
- sudo docker pull ubuntu:bionic
11+
- sudo docker pull ubuntu:focal
1312
- sudo docker build -t rcldocker .
1413

1514
script:

Dockerfile

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:bionic
1+
FROM ubuntu:focal
22

33
ENV GIT_USER_NAME mrbuild
44
ENV GIT_USER_EMAIL [email protected]
@@ -9,16 +9,14 @@ ENV LANG en_US.UTF-8
99

1010
RUN apt install -y gnupg2 lsb-release
1111
RUN curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | apt-key add -
12-
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'
12+
RUN sh -c 'echo "deb [arch=amd64] http://packages.ros.org/ros2/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/ros2-latest.list'
1313

1414
# Install prerequisites
1515
RUN export DEBIAN_FRONTEND=noninteractive && apt update && apt install -y \
1616
build-essential \
17-
cmake \
1817
python3-colcon-common-extensions \
19-
python3-pip \
20-
python-rosdep \
21-
libpython3-dev \
18+
python3-rosdep \
19+
libssl-dev \
2220
cppcheck
2321

2422
RUN rosdep init
@@ -32,18 +30,16 @@ RUN git config --global user.name $GIT_USER_NAME \
3230
ENV ROS2_WS=/root
3331
WORKDIR $ROS2_WS
3432

35-
RUN wget https://ci.ros2.org/view/packaging/job/packaging_linux/lastStableBuild/artifact/ws/ros2-package-linux-x86_64.tar.bz2 \
36-
&& tar xf ros2-package-linux-x86_64.tar.bz2
33+
RUN wget https://github.com/ros2/ros2/releases/download/release-foxy-20200605/ros2-foxy-20200605-linux-focal-amd64.tar.bz2 \
34+
&& tar xf ros2-foxy-20200605-linux-focal-amd64.tar.bz2
3735

38-
# [Ubuntu 18.04]
39-
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"
36+
# [Ubuntu 20.04]
37+
RUN rosdep install --from-paths $ROS2_WS/ros2-linux/share --ignore-src --rosdistro foxy -y --skip-keys "console_bridge fastcdr fastrtps 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"
4038

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

4341
# Install nvm, Node.js and node-gyp
44-
ENV NODE_VERSION v12.16.1
45-
RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash \
46-
&& . $HOME/.nvm/nvm.sh \
47-
&& nvm install $NODE_VERSION && nvm alias default $NODE_VERSION
42+
ENV NODE_VERSION v12.18.0
43+
RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
4844

4945
ENV PATH /bin/versions/node/$NODE_VERSION/bin:$PATH

appveyor.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ version: '{branch}-{build}'
22

33
branches:
44
only:
5-
- master
6-
- develop
5+
- foxy-fitzroy
76

87
image: Visual Studio 2017
98

@@ -22,14 +21,15 @@ before_build:
2221
- choco install -y vcredist140
2322
- "SET PATH=C:\\Program Files\\CMake\\bin;%PATH%"
2423
- appveyor DownloadFile https://github.com/ros2/choco-packages/releases/download/2019-10-24/asio.1.12.1.nupkg
24+
- appveyor DownloadFile https://github.com/ros2/choco-packages/releases/download/2020-02-24/bullet.2.89.0.nupkg
2525
- appveyor DownloadFile https://github.com/ros2/choco-packages/releases/download/2019-10-24/cunit.2.1.3.nupkg
2626
- appveyor DownloadFile https://github.com/ros2/choco-packages/releases/download/2019-10-24/eigen.3.3.4.nupkg
2727
- appveyor DownloadFile https://github.com/ros2/choco-packages/releases/download/2019-10-24/tinyxml-usestl.2.6.2.nupkg
2828
- appveyor DownloadFile https://github.com/ros2/choco-packages/releases/download/2019-10-24/tinyxml2.6.0.0.nupkg
2929
- appveyor DownloadFile https://github.com/ros2/choco-packages/releases/download/2019-10-24/log4cxx.0.10.0.nupkg
30-
- choco install -y -s c:\download\ asio cunit eigen tinyxml-usestl tinyxml2 log4cxx
31-
- appveyor DownloadFile https://ci.ros2.org/view/packaging/job/packaging_windows/lastSuccessfulBuild/artifact/ws/ros2-package-windows-AMD64.zip
32-
- 7z x -y "c:\download\ros2-package-windows-AMD64.zip" -o"c:\" > nul
30+
- choco install -y -s c:\download\ asio bullet cunit eigen tinyxml-usestl tinyxml2 log4cxx
31+
- appveyor DownloadFile https://github.com/ros2/ros2/releases/download/release-foxy-20200605/ros2-foxy-20200605-windows-release-amd64.zip
32+
- 7z x -y "c:\download\ros2-foxy-20200605-windows-release-amd64.zip" -o"c:\" > nul
3333
- setx -m OPENSSL_CONF C:\OpenSSL-Win64\bin\openssl.cfg
3434
- set PATH=C:\OpenSSL-Win64\bin;%PATH%
3535
- setx AMENT_PYTHON_EXECUTABLE "c:\Python37"

test/blacklist.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Linux": [],
3-
"Darwin": [],
4-
"Windows_NT": []
2+
"Linux": ["test-multi-nodes.js", "test-msg-type-py-node.js", "test-msg-type-cpp-node.js", "test-cross-lang.js"],
3+
"Darwin": ["test-multi-nodes.js", "test-msg-type-py-node.js", "test-msg-type-cpp-node.js", "test-cross-lang.js"],
4+
"Windows_NT": ["test-multi-nodes.js", "test-msg-type-py-node.js", "test-msg-type-cpp-node.js", "test-cross-lang.js"]
55
}

0 commit comments

Comments
 (0)