From 6ec08ec58a7ebbb61c93b42896e9ae1f79fe1ccf Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Tue, 7 Jan 2025 08:34:27 +0000 Subject: [PATCH 1/2] 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 Date: Tue, 7 Jan 2025 08:34:49 +0000 Subject: [PATCH 2/2] 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 @@ pr2eus - jsk_pcl_ros app_manager @@ -31,6 +30,7 @@ jsk_rviz_plugins jsk_pr2_startup jsk_maps + jsk_pcl_ros rostest