From 6ec08ec58a7ebbb61c93b42896e9ae1f79fe1ccf Mon Sep 17 00:00:00 2001
From: Kei Okada <kei.okada@gmail.com>
Date: Tue, 7 Jan 2025 08:34:27 +0000
Subject: [PATCH 1/4] fix CI: update jsk_travis 0.5.27, override node20
 https://github.com/actions/upload-artifact/issues/616#issuecomment-2350667347,
 see https://github.com/jsk-ros-pkg/jsk_common/pull/1808

---
 .github/workflows/config.yml | 20 +++++++++++++++++++-
 .travis                      |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 1f36fe14..d0e65e26 100644
--- 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/checkout@v3.0.2
 
diff --git a/.travis b/.travis
index 5bd244b6..b223c886 160000
--- a/.travis
+++ b/.travis
@@ -1 +1 @@
-Subproject commit 5bd244b66837b1ceacc2288b09c1530e9abb661f
+Subproject commit b223c886bcda0d96c6c03b0f0ae07da768a00155

From ad7df4e7eea66b2303e84ff9c844e91289682c1d Mon Sep 17 00:00:00 2001
From: Kei Okada <kei.okada@gmail.com>
Date: Tue, 7 Jan 2025 08:34:49 +0000
Subject: [PATCH 2/4] pr2eus_tutorials: move jsk_pcl_ros from build_depend to
 run_depend

---
 pr2eus_tutorials/package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pr2eus_tutorials/package.xml b/pr2eus_tutorials/package.xml
index 95d0493b..95180181 100644
--- a/pr2eus_tutorials/package.xml
+++ b/pr2eus_tutorials/package.xml
@@ -16,7 +16,6 @@
 
   <!-- 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>
@@ -31,6 +30,7 @@
   <run_depend>jsk_rviz_plugins</run_depend>
   <run_depend>jsk_pr2_startup</run_depend>
   <run_depend>jsk_maps</run_depend>
+  <run_depend>jsk_pcl_ros</run_depend>
 
   <!-- Dependencies needed only for running tests. -->
   <test_depend>rostest</test_depend>

From 16fb52ed214604e8ba974e603e33523667f5ca17 Mon Sep 17 00:00:00 2001
From: Kei Okada <kei.okada@gmail.com>
Date: Wed, 8 Jan 2025 01:57:55 +0000
Subject: [PATCH 3/4] pr2eus_tutorials: package.xml convert to format 3

---
 pr2eus_tutorials/package.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pr2eus_tutorials/package.xml b/pr2eus_tutorials/package.xml
index 95180181..4b9b9d14 100644
--- 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>
@@ -18,19 +18,19 @@
   <build_depend>pr2eus</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>
-  <run_depend>jsk_pcl_ros</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>
+  <exec_depend>jsk_pr2_startup</exec_depend>
+  <exec_depend>jsk_maps</exec_depend>
+  <exec_depend>jsk_pcl_ros</exec_depend>
 
   <!-- Dependencies needed only for running tests. -->
   <test_depend>rostest</test_depend>

From d9581b1773f8dab3e991f66a097b545ae9933b79 Mon Sep 17 00:00:00 2001
From: Kei Okada <kei.okada@gmail.com>
Date: Wed, 8 Jan 2025 02:02:29 +0000
Subject: [PATCH 4/4] pr2eus_tutorials/package.xml: skip jsk_pr2_startup and
 jsk_maps when ROS_DISTRO==debian, as they are circular dependency

---
 pr2eus_tutorials/package.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pr2eus_tutorials/package.xml b/pr2eus_tutorials/package.xml
index 4b9b9d14..f14fbdeb 100644
--- a/pr2eus_tutorials/package.xml
+++ b/pr2eus_tutorials/package.xml
@@ -28,8 +28,10 @@
   <exec_depend>jsk_interactive_marker</exec_depend>
   <exec_depend>jsk_recognition_msgs</exec_depend>
   <exec_depend>jsk_rviz_plugins</exec_depend>
-  <exec_depend>jsk_pr2_startup</exec_depend>
-  <exec_depend>jsk_maps</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. -->