From 0d1b36306c7da6b9dd354819f5894acebba1449b Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sun, 29 May 2022 08:31:59 +0900 Subject: [PATCH 1/4] use gazebo from http://packages.osrfoundation.org/gazebo/ubuntu, force download ~/.gazebo/models c.f. https://github.com/jsk-ros-pkg/jsk_pr2eus/pull/479 --- .github/workflows/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 6f9438e0d..fa0928fee 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -30,6 +30,7 @@ jobs: NOT_TEST_INSTALL : true INSTALL_SRC : "http://github.com/jsk-ros-pkg/jsk_pr2eus" TEST_PKGS : "pr2eus pr2eus_moveit" + BEFORE_SCRIPT: "echo 'deb http://packages.osrfoundation.org/gazebo/ubuntu trusty main' | sudo tee /etc/apt/sources.list.d/gazebo-stable.list; wget --no-check-certificate https://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -; sudo apt update -y; sudo apt dist-upgrade -y; mkdir -p ~/.gazebo/; git clone --depth=1 https://github.com/osrf/gazebo_models.git ~/.gazebo/models" - ROS_DISTRO: indigo CONTAINER: jskrobotics/ros-ubuntu:14.04 USE_DEB: false @@ -53,6 +54,7 @@ jobs: NOT_TEST_INSTALL : true INSTALL_SRC : "http://github.com/jsk-ros-pkg/jsk_pr2eus" TEST_PKGS : "pr2eus pr2eus_moveit" + BEFORE_SCRIPT: "echo 'deb http://packages.osrfoundation.org/gazebo/ubuntu xenial main' | sudo tee /etc/apt/sources.list.d/gazebo-stable.list; wget --no-check-certificate https://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -; sudo apt update -y" - ROS_DISTRO: kinetic CONTAINER: ubuntu:16.04 USE_DEB: false @@ -166,3 +168,4 @@ jobs: USE_DEB : ${{ matrix.USE_DEB }} NOT_TEST_INSTALL : ${{ matrix.NOT_TEST_INSTALL }} TEST_PKGS : ${{ matrix.TEST_PKGS }} + BEFORE_SCRIPT : ${{ matrix.BEFORE_SCRIPT }} From 92e74fab3f281ed757242f9a7302c94e85669e3a Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Mon, 30 May 2022 14:45:17 +0900 Subject: [PATCH 2/4] use -j1 for ROS_PARALLEL_JOBS, c.f. https://github.com/euslisp/jskeus/pull/621 --- .github/workflows/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index fa0928fee..3f51d6480 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -160,9 +160,9 @@ jobs: - name: Run jsk_travis uses: jsk-ros-pkg/jsk_travis@master with: - ROS_PARALLEL_JOBS : "-j2" + ROS_PARALLEL_JOBS : "-j1" CATKIN_PARALLEL_JOBS : "-p2" - ROS_PARALLEL_TEST_JOBS : "-j2" + ROS_PARALLEL_TEST_JOBS : "-j1" CATKIN_PARALLEL_TEST_JOBS : "-p2" ROS_DISTRO : ${{ matrix.ROS_DISTRO }} USE_DEB : ${{ matrix.USE_DEB }} From 0c8ea3e980a832fd3530c79b4deecf76cd3fd02a Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Mon, 30 May 2022 14:51:23 +0900 Subject: [PATCH 3/4] disable Start Xserver for kinetic/pr2eus --- .github/workflows/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 3f51d6480..5cdc8ff8f 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -128,6 +128,8 @@ jobs: uses: actions/checkout@v2 - name: Start X server + if: ${{ matrix.ROS_DISTRO == 'kinetic' && matrix.TEST_PKGS == 'pr2eus pr2eus_moveit' }} + run: | echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections || echo "failing on ros-ubuntu is OK" # set non interactive tzdata https://stackoverflow.com/questions/8671308/non-interactive-method-for-dpkg-reconfigure-tzdata sudo apt-get -y -qq install mesa-utils x11-xserver-utils xserver-xorg-video-dummy wget From 2135208ee6aee35e4dbd7fdbbbc03602ddb9e461 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Tue, 31 May 2022 18:41:00 +0900 Subject: [PATCH 4/4] indigo: USE_DEB=false, use latest CMakeLists.txt --- .github/workflows/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 5cdc8ff8f..ae2d493cf 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -35,6 +35,7 @@ jobs: CONTAINER: jskrobotics/ros-ubuntu:14.04 USE_DEB: false NOT_TEST_INSTALL : false + BEFORE_SCRIPT: "wget https://raw.githubusercontent.com/tork-a/jskeus-release/master/patches/CMakeLists.txt -O jskeus/CMakeLists.txt" - ROS_DISTRO: indigo CONTAINER: jskrobotics/ros-ubuntu:14.04 USE_DEB: source