Merge branch 'master' into outlier-removal-xyzirt

jsk-ros-pkg · Oct 28, 2024 · a3dcddd · a3dcddd
2 parents 0af7acd + 827c61a
commit a3dcddd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -4,6 +4,9 @@ on:
       - master
   pull_request:
 
+env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
 jobs:
   ros:
     runs-on: ubuntu-latest

diff --git a/.travis b/.travis
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,9 @@ on: @@
           - master
       pull_request:
+    env:
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     jobs:
       ros:
         runs-on: ubuntu-latest
@@ Expand Down @@
+4 −4		.github/workflows/generate_action_config.py
+2 −2		.github/workflows/indigo.yml
+2 −2		.github/workflows/kinetic.yml
+22 −22		.github/workflows/main.yml
+2 −2		.github/workflows/melodic.yml
+2 −2		.github/workflows/noetic.yml
+1 −1		.github/workflows/python2.yml
+1 −1		.github/workflows/python3.yml
+3 −2		.travis.yml
+32 −0		CHANGELOG.rst
+1 −1		action.yml
+1 −1		docker/Dockerfile.ros-ubuntu:14.04-pcl
+1 −1		docker/Dockerfile.ros-ubuntu:14.04-pcl1.8
+1 −1		docker/Dockerfile.ros-ubuntu:16.04
+1 −1		docker/Dockerfile.ros-ubuntu:16.04-pcl
+1 −1		docker/Dockerfile.ros-ubuntu:18.04
+1 −1		docker/Dockerfile.ros-ubuntu:18.04-pcl
+1 −1		docker/Dockerfile.ros-ubuntu:20.04-pcl
+1 −1		package.xml
+12 −0		rosdep_snapshots/30-bionic.list
+12 −0		rosdep_snapshots/30-xenial.list
+8 −3		travis.sh