Skip to content

Commit 7b19103

Browse files
author
Minggang Wang
committed
Update Node.js to v12.20.0
Fix #713
1 parent ff27ef8 commit 7b19103

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
- run: brew install asio console_bridge log4cxx spdlog
2424
- run: python3 -m pip install catkin_pkg empy ifcfg lark-parser lxml netifaces numpy pyparsing pyyaml setuptools argcomplete colcon-common-extensions
2525
- run: mkdir -p ~/ros2_install && cd ~/ros2_install && wget https://github.com/ros2/ros2/releases/download/release-foxy-20201009/ros2-foxy-20201009-macos-amd64.tar.bz2 && tar xf ros2-foxy-20201009-macos-amd64.tar.bz2
26-
- run: wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.36.0/install.sh | bash
26+
- run: wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.0/install.sh | bash
2727
- run: echo "source $HOME/.bashrc" >> ~/.bash_profile
2828
- run: cat ~/.bash_profile
29-
- run: nvm install v12.18.4
30-
- run: nvm alias default v12.18.4
29+
- run: nvm install v12.20.0
30+
- run: nvm alias default v12.20.0
3131
- run: node --version && npm --version && rm -rf ./node_modules/
3232
- run: source ~/ros2_install/ros2-osx/local_setup.bash && git submodule init && git submodule update && npm install --python=python2.7
3333
- run: export PATH="/usr/local/opt/python@2/libexec/bin:$PATH" && npm run lint

Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@ RUN rosdep install --from-paths $ROS2_WS/ros2-linux/share --ignore-src --rosdist
3939
RUN echo "source $ROS2_WS/ros2-linux/local_setup.bash" >> $HOME/.bashrc
4040

4141
# Install nvm, Node.js and node-gyp
42+
<<<<<<< HEAD
4243
ENV NODE_VERSION v12.18.4
4344
RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.36.0/install.sh | bash
45+
=======
46+
ENV NODE_VERSION v12.20.0
47+
RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.0/install.sh | bash
48+
>>>>>>> Update Node.js to v12.20.0
4449

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

0 commit comments

Comments
 (0)