Merge pull request #501 from k-okada/skip_circular_dependency

Skip circular dependency when building ROS-O package
jsk-ros-pkg · Jan 9, 2025 · 46b7fb2 · 46b7fb2
2 parents 16cb8fa + d9581b1
commit 46b7fb2
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -72,7 +72,10 @@ jobs:
             TEST_PKGS: "pr2eus_moveit pr2eus_tutorials"
 
 
-    container: ${{ matrix.CONTAINER }}
+    container:
+      image: ${{ matrix.CONTAINER }}
+      volumes:
+        - /tmp/node20:/__e/node20
 
     steps:
       - name: Install latest git ( use sudo for ros-ubuntu )
@@ -96,6 +99,21 @@ jobs:
              git config --global --add safe.directory $GITHUB_WORKSPACE
           fi
 
+      - name: Try to replace `node` with an glibc 2.17
+        shell: bash
+        run: |
+          if [ "${{ matrix.CONTAINER }}" = "jskrobotics/ros-ubuntu:14.04" ]; then
+             export USER=$(whoami)
+             sudo chmod 777 -R /__e/node20
+             sudo chown -R $USER /__e/node20
+          fi
+          ls -lar /__e/node20 &&
+          sudo apt-get install -y curl &&
+          curl -Lo /tmp/node.tar.gz https://unofficial-builds.nodejs.org/download/release/v20.17.0/node-v20.17.0-linux-x64-glibc-217.tar.gz &&
+          cd /__e/node20 &&
+          tar -x --strip-components=1 -f /tmp/node.tar.gz &&
+          ls -lar /__e/node20/bin/
+
       - name: Checkout
         uses: actions/[email protected]
 

diff --git a/.travis b/.travis
diff --git a/pr2eus_tutorials/package.xml b/pr2eus_tutorials/package.xml
@@ -1,4 +1,4 @@
-<package>
+<package format="3">
   <name>pr2eus_tutorials</name>
   <version>0.3.15</version>
   <description>pr2eus_tutorials</description>
@@ -16,21 +16,23 @@
 
   <!-- Dependencies needed to compile this package. -->
   <build_depend>pr2eus</build_depend>
-  <build_depend>jsk_pcl_ros</build_depend>
 
   <!-- Dependencies needed after this package is compiled. -->
-  <run_depend>app_manager</run_depend>
-  <run_depend>eusurdf</run_depend>
-  <run_depend>pr2_gazebo</run_depend>
-  <run_depend>pr2eus</run_depend>
-  <run_depend>roseus_tutorials</run_depend>
-  <run_depend>image_view2</run_depend>
-  <run_depend>jsk_pcl_ros</run_depend>
-  <run_depend>jsk_interactive_marker</run_depend>
-  <run_depend>jsk_recognition_msgs</run_depend>
-  <run_depend>jsk_rviz_plugins</run_depend>
-  <run_depend>jsk_pr2_startup</run_depend>
-  <run_depend>jsk_maps</run_depend>
+  <exec_depend>app_manager</exec_depend>
+  <exec_depend>eusurdf</exec_depend>
+  <exec_depend>pr2_gazebo</exec_depend>
+  <exec_depend>pr2eus</exec_depend>
+  <exec_depend>roseus_tutorials</exec_depend>
+  <exec_depend>image_view2</exec_depend>
+  <exec_depend>jsk_pcl_ros</exec_depend>
+  <exec_depend>jsk_interactive_marker</exec_depend>
+  <exec_depend>jsk_recognition_msgs</exec_depend>
+  <exec_depend>jsk_rviz_plugins</exec_depend>
+  <!-- jsk_pr2_startup is provided from jsk_robot, this is circular dependency -->
+  <exec_depend condition="$ROS_DISTRO != debian">jsk_pr2_startup</exec_depend>
+  <!-- jsk_maps is provided from jsk_demos, this is circular dependency -->
+  <exec_depend condition="$ROS_DISTRO != debian">jsk_maps</exec_depend>
+  <exec_depend>jsk_pcl_ros</exec_depend>
 
   <!-- Dependencies needed only for running tests. -->
   <test_depend>rostest</test_depend>
+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
+3 −3		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
+7 −7		travis_jenkins.py