From 73f40365e2257c372db446274af63f7ac1e4f010 Mon Sep 17 00:00:00 2001 From: Wayne Parrott <5588978+wayneparrott@users.noreply.github.com> Date: Wed, 5 Jan 2022 08:38:55 -0600 Subject: [PATCH] appveyor builds occasionally fail for node 16 & 17 (#828) * Removed node17 from release scope * rRadded signal tests that were commented out during dev * Appveyor.yml - reversed the order of node versions to be in decending order, e.g., 17, 16, ... Doing this will speed up identifying build failures and debug-fix iterations. * Updated appveyor ament_python env to pt to python310 * Fix countPublishers() test --- .circleci/config.yml | 4 +--- .travis.yml | 1 - Dockerfile | 1 - README.md | 2 +- appveyor.yml | 9 ++++----- scripts/npmjs-readme.md | 2 +- test/test-node-oo.js | 4 +++- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 459dc311..e551c984 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,9 +52,7 @@ jobs: # setup nvm - run: wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash - run: echo "source $HOME/.bashrc" >> ~/.bash_profile - # run test suite for node 12, 14, 16, 17 - - run_tests: - node_version: v17 + # run test suite for node 12, 14, 16 - run_tests: node_version: lts/gallium - run_tests: diff --git a/.travis.yml b/.travis.yml index 13ede22c..aa638cc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ script: - 'if [ "$DOCKER_USERNAME" != "" ]; then sudo docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD; fi' - sudo docker pull ubuntu:focal - sudo docker build -t rcldocker . - - docker run -v $(pwd):/ros2/rclnodejs --rm rcldocker bash -i -c '\. $NVM_DIR/nvm.sh && nvm use v17 && cd /ros2/rclnodejs && /usr/bin/cppcheck --suppress=syntaxError --enable=all src/*.cpp src/*.hpp && cp -R /ros2/rclnodejs ~/rclnodejs && chown -R rclnodejs-user ~/rclnodejs && cd ~/rclnodejs && ./scripts/build.sh && npm test' - docker run -v $(pwd):/ros2/rclnodejs --rm rcldocker bash -i -c '\. $NVM_DIR/nvm.sh && nvm use v16 && cd /ros2/rclnodejs && /usr/bin/cppcheck --suppress=syntaxError --enable=all src/*.cpp src/*.hpp && cp -R /ros2/rclnodejs ~/rclnodejs && chown -R rclnodejs-user ~/rclnodejs && cd ~/rclnodejs && ./scripts/build.sh && npm test' - docker run -v $(pwd):/ros2/rclnodejs --rm rcldocker bash -i -c '\. $NVM_DIR/nvm.sh && nvm use v14 && cp -R /ros2/rclnodejs ~/rclnodejs && chown -R rclnodejs-user ~/rclnodejs && cd ~/rclnodejs && ./scripts/build.sh && npm test' - docker run -v $(pwd):/ros2/rclnodejs --rm rcldocker bash -i -c '\. $NVM_DIR/nvm.sh && nvm use v12 && cp -R /ros2/rclnodejs ~/rclnodejs && chown -R rclnodejs-user ~/rclnodejs && cd ~/rclnodejs && ./scripts/build.sh && npm test' diff --git a/Dockerfile b/Dockerfile index 43c70dfc..48127004 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,4 +60,3 @@ RUN bash -c "\. .nvm/nvm.sh && nvm install v10.23.1" RUN bash -c "\. .nvm/nvm.sh && nvm install lts/erbium" RUN bash -c "\. .nvm/nvm.sh && nvm install lts/fermium" RUN bash -c "\. .nvm/nvm.sh && nvm install lts/gallium" -RUN bash -c "\. .nvm/nvm.sh && nvm install v17" diff --git a/README.md b/README.md index 26305e0e..35d9dd4b 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ rclnodejs.init().then(() => { Before installing `rclnodejs` please ensure the following software is installed and configured on your system: -- [Nodejs](https://nodejs.org/en/) version between 10.23.1 - 17.x. +- [Nodejs](https://nodejs.org/en/) version between 10.23.1 - 16.x. - [ROS 2 SDK](https://index.ros.org/doc/ros2/Installation/) for details. **DON'T FORGET TO [SOURCE THE ROS 2 SETUP FILE](https://index.ros.org/doc/ros2/Tutorials/Configuring-ROS2-Environment/#source-the-setup-files)** diff --git a/appveyor.yml b/appveyor.yml index 637042c2..5801e4d2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,11 +10,10 @@ environment: PYTHON3: "c:\\Python310-x64" PYTHON2: "c:\\Python27" matrix: - - nodejs_version: "10" - - nodejs_version: "12" - - nodejs_version: "14" - nodejs_version: "16" - - nodejs_version: "17" + - nodejs_version: "14" + - nodejs_version: "12" + - nodejs_version: "10" clone_folder: c:\proj\rclnodejs @@ -37,7 +36,7 @@ before_build: - 7z x -y "c:\download\ros2-package-windows-AMD64.zip" -o"c:\" > nul - setx -m OPENSSL_CONF C:\OpenSSL-v111-Win64\bin\openssl.cfg - set PATH=C:\OpenSSL-v111-Win64\bin;%PATH% - - setx AMENT_PYTHON_EXECUTABLE "c:\Python39" + - setx AMENT_PYTHON_EXECUTABLE "c:\Python310" - refreshenv - "SET PATH=%PYTHON3%;%PYTHON3%\\bin;%PYTHON3%\\Scripts;%PATH%" - python -m pip install -U wheel catkin_pkg cryptography empy ifcfg lark-parser lxml netifaces numpy opencv-python pyparsing pyyaml setuptools colcon-common-extensions diff --git a/scripts/npmjs-readme.md b/scripts/npmjs-readme.md index 56e572a0..3b87e9bd 100644 --- a/scripts/npmjs-readme.md +++ b/scripts/npmjs-readme.md @@ -18,7 +18,7 @@ rclnodejs.init().then(() => { **Node.js** -- [Node.js](https://nodejs.org/en/) version between 8.12 - 17.x. +- [Node.js](https://nodejs.org/en/) version between 10.23 - 16.x. **ROS 2 SDK** diff --git a/test/test-node-oo.js b/test/test-node-oo.js index 9fd68312..5bc2f65d 100644 --- a/test/test-node-oo.js +++ b/test/test-node-oo.js @@ -396,13 +396,15 @@ describe('rcl node methods testing', function () { assert.strictEqual(currentNode.namespace, '/my_ns'); }); - it('node.countPublishers', function () { + it('node.countPublishers', async () => { assert.strictEqual(node.countPublishers('chatter'), 0); node.createPublisher(RclString, 'chatter'); + await assertUtils.createDelay(500); assert.strictEqual(node.countPublishers('chatter'), 1); node.createPublisher(RclString, 'chatter'); + await assertUtils.createDelay(500); assert.strictEqual(node.countPublishers('chatter'), 2); });