Skip to content

Commit 602a5df

Browse files
author
Minggang Wang
committed
Change the ROS2 packaging used for CIs
Currently, the ROS2 packages (last stable) used on macOS fails consistently and those packages were built several months ago. This patch changes to the last successful ones which can reflect the ROS2 changes in time. Fix #None
1 parent a04c6d2 commit 602a5df

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.circleci/config.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,18 @@ jobs:
1818
# fallback to using the latest cache if no exact match is found
1919
- v1-dependencies-
2020
- run: brew update
21-
- run: brew install wget cmake cppcheck tinyxml tinyxml2 eigen pcre poco
21+
- run: brew install wget cmake cppcheck tinyxml tinyxml2 eigen pcre
22+
# Pin poco to 1.9.4
23+
- run: brew install https://raw.githubusercontent.com/alebcay/homebrew-core/055f2f99de581160b142c3ccad392766e7b99d28/Formula/poco.rb
2224
- run: brew install openssl
2325
- run: brew install asio console_bridge
2426
- run: python3 -m pip install catkin_pkg empy git+https://github.com/lark-parser/[email protected] pyparsing pyyaml setuptools argcomplete colcon-common-extensions numpy
25-
- run: mkdir -p ~/ros2_install && cd ~/ros2_install && wget https://ci.ros2.org/view/packaging/job/packaging_osx/lastStableBuild/artifact/ws/ros2-package-osx-x86_64.tar.bz2 && tar xf ros2-package-osx-x86_64.tar.bz2
26-
- run: wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
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
2729
- run: echo "source $HOME/.bashrc" >> ~/.bash_profile
2830
- run: cat ~/.bash_profile
29-
- run: nvm install v10.16.1
30-
- run: nvm alias default v10.16.1
31+
- run: nvm install v10.19.0
32+
- run: nvm alias default v10.19.0
3133
- run: node --version && npm --version && rm -rf ./node_modules/
3234
- run: source ~/ros2_install/ros2-osx/local_setup.bash && git submodule init && git submodule update && npm install --python=python2.7
3335
- run: export PATH="/usr/local/opt/python@2/libexec/bin:$PATH" && npm run lint

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN git config --global user.name $GIT_USER_NAME \
3232
ENV ROS2_WS=/root
3333
WORKDIR $ROS2_WS
3434

35-
RUN wget https://ci.ros2.org/view/packaging/job/packaging_linux/lastStableBuild/artifact/ws/ros2-package-linux-x86_64.tar.bz2 \
35+
RUN wget https://ci.ros2.org/view/packaging/job/packaging_linux/lastSuccessfulBuild/artifact/ws/ros2-package-linux-x86_64.tar.bz2 \
3636
&& tar xf ros2-package-linux-x86_64.tar.bz2
3737

3838
# [Ubuntu 18.04]
@@ -41,8 +41,8 @@ RUN rosdep install --from-paths $ROS2_WS/ros2-linux/share --ignore-src --rosdist
4141
RUN echo "source $ROS2_WS/ros2-linux/local_setup.bash" >> $HOME/.bashrc
4242

4343
# Install nvm, Node.js and node-gyp
44-
ENV NODE_VERSION v10.16.1
45-
RUN wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash \
44+
ENV NODE_VERSION v10.19.0
45+
RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash \
4646
&& . $HOME/.nvm/nvm.sh \
4747
&& nvm install $NODE_VERSION && nvm alias default $NODE_VERSION
4848

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ before_build:
2929
- appveyor DownloadFile https://github.com/ros2/choco-packages/releases/download/2019-10-24/tinyxml2.6.0.0.nupkg
3030
- appveyor DownloadFile https://github.com/ros2/choco-packages/releases/download/2019-10-24/log4cxx.0.10.0.nupkg
3131
- choco install -y -s c:\download\ asio cunit eigen tinyxml-usestl tinyxml2 log4cxx
32-
- appveyor DownloadFile http://ci.ros2.org/view/packaging/job/packaging_windows/lastStableBuild/artifact/ws/ros2-package-windows-AMD64.zip
32+
- appveyor DownloadFile https://ci.ros2.org/view/packaging/job/packaging_windows/lastSuccessfulBuild/artifact/ws/ros2-package-windows-AMD64.zip
3333
- 7z x -y "c:\download\ros2-package-windows-AMD64.zip" -o"c:\" > nul
3434
- setx -m OPENSSL_CONF C:\OpenSSL-Win64\bin\openssl.cfg
3535
- set PATH=C:\OpenSSL-Win64\bin;%PATH%

0 commit comments

Comments
 (0)