Imported upstream version '2.2.13' of 'upstream'

tork-a · Nov 9, 2023 · 71dd34d · 71dd34d
1 parent b7ae531
commit 71dd34d
Show file tree

Hide file tree

Showing 165 changed files with 4,313 additions and 223 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -20,7 +20,7 @@ jobs:
             ROS_PARALLEL_TEST_JOBS: "-j8"
             # latest catkin_virtualenv with pip==21.0.1 is incompatible with python 2.x
             # https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/237
-            BEFORE_SCRIPT : "sudo pip install virtualenv==15.1.0"
+            BEFORE_SCRIPT : "sudo pip install virtualenv==15.1.0 setuptools==44.1.1"
           - ROS_DISTRO: kinetic
             CONTAINER: ubuntu:16.04
             ROS_PARALLEL_TEST_JOBS: "-j8"
@@ -30,6 +30,13 @@ jobs:
           - ROS_DISTRO: noetic
             CONTAINER: ubuntu:20.04
             ROS_PARALLEL_TEST_JOBS: "-j8"
+          - ROS_DISTRO: noetic
+            CONTAINER: ubuntu:20.04
+            ROS_PARALLEL_TEST_JOBS: "-j8"
+            TEST_PKGS: virtual_force_publisher # skip test
+            CATKIN_TOOLS_BUILD_OPTIONS: "--cmake-args -DCMAKE_CXX_FLAGS=-std=c++11 -- --summarize --no-status"
+            NOT_TEST_INSTALL: true
+            BEFORE_SCRIPT : "find $GITHUB_WORKSPACE -iname image_view2 -exec touch {}/CATKIN_IGNORE \\;"
 
 
     container: ${{ matrix.CONTAINER }}
@@ -56,10 +63,11 @@ jobs:
           fi
 
       - name: Chcekout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
 
       - name: Start X server
         run: |
+          if [[ "${{ matrix.CONTAINER }}" =~ "jskrobotics/ros-ubuntu:14.04" ]]; then exit 0; fi
           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
           export DISPLAY=:0
@@ -68,6 +76,7 @@ jobs:
           sleep 3 # wait x server up
           export QT_X11_NO_MITSHM=1 # http://wiki.ros.org/docker/Tutorials/GUI
           xhost +local:root
+        shell: bash
 
       - name: Run jsk_travis
         uses: jsk-ros-pkg/jsk_travis@master
@@ -82,3 +91,82 @@ jobs:
           TEST_PKGS : ${{ matrix.TEST_PKGS }}
           BEFORE_SCRIPT : ${{ matrix.BEFORE_SCRIPT }}
           EXTRA_DEB : ${{ matrix.EXTRA_DEB }}
+          CATKIN_TOOLS_BUILD_OPTIONS: ${{ matrix.CATKIN_TOOLS_BUILD_OPTIONS }}
+
+
+  ubuntu:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - DISTRO: ubuntu:22.04
+          # - DISTRO: ubuntu:22.04
+          #   CATKIN_OPTIONS: "--ignore-pkg image_view2"
+          #   CMAKE_OPTIONS: "-DCMAKE_CXX_FLAGS=-std=c++11"
+
+    container: ${{ matrix.DISTRO }}
+
+    steps:
+      - name: Chcekout Source
+        uses: actions/[email protected]
+
+      - name: Install Buildtools
+        run: |
+          set -x
+          echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+          apt update -q
+          apt install -y -q -qq catkin git curl build-essential libboost-all-dev python3-pip python3-venv python3-rosdep2
+          apt install -y -q -qq ros-desktop-dev rosbash
+          apt install -y -q -qq libself-test-dev libpcl-ros-dev
+          apt install -y -q -qq ros-core-dev ros-robot-dev
+          pip install vcstool
+          rosdep update
+
+      - name: Setup rosinstall_generator
+        run: |
+          set -x
+          # install rosinstall_geneartor with --depend-type buildtool build, see  https://github.com/ros-infrastructure/rosinstall_generator/pull/81
+          git clone https://github.com/k-okada/rosinstall_generator -b add_depend_type
+          cd rosinstall_generator
+          python3 ./setup.py install
+
+      - name: Setup Dependencies Workspace
+        run: |
+          set -x
+          # install dependencies
+          mkdir -p ~/ws_depend/src
+          cd ~/ws_depend/src
+          ROS_PACKAGE_PATH=/usr/share rosinstall_generator --rosdistro noetic --from-path $GITHUB_WORKSPACE --deps --exclude RPP --depend-type buildtool build | tee repos
+          vcs import --shallow < repos
+          # override to use latest development for 22.04
+          rosinstall_generator laser_filters laser_assembler map_server --rosdistro noetic  --upstream-development  | vcs import --force
+          rosinstall_generator catkin_virtualenv --rosdistro noetic | vcs import --force
+          rm -fr jsk_common
+          # Run catkin_run_tests_target only when CATKIN_ENABLE_TESTING is enabled #89 (https://github.com/locusrobotics/catkin_virtualenv/pull/89)
+          curl -s -L -O https://patch-diff.githubusercontent.com/raw/locusrobotics/catkin_virtualenv/pull/89.diff
+          patch -p1 < 89.diff
+          rosdep install -qq -r -y --from-path . --ignore-src || echo "OK"
+          cd ..
+          catkin_make_isolated --cmake-args -DCATKIN_ENABLE_TESTING=OFF
+
+      - name: Setup Workspace
+        run: |
+          set -x
+          # hack!
+          apt install -y -q -qq python-is-python3
+          sed -i s/noetic/Debian/ $GITHUB_WORKSPACE/jsk_rosbag_tools/CMakeLists.txt
+          # setup workspace
+          mkdir -p ~/ws_current/src
+          cd ~/ws_current/src
+          ln -sf $GITHUB_WORKSPACE .
+          rosdep install -qq -r -y --from-path . --ignore-src || echo "OK"
+
+      - name: Compile Packages
+        run: |
+          set -x
+          cd ~/ws_current/
+          source ~/ws_depend/devel_isolated/setup.bash
+          catkin_make_isolated ${{ matrix.CATKIN_OPTIONS }} --cmake-args -DCATKIN_ENABLE_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON ${{ matrix.CMAKE_OPTIONS }}
+        shell: bash
diff --git a/.travis/.github/workflows/generate_action_config.py b/.travis/.github/workflows/generate_action_config.py
@@ -43,11 +43,11 @@ def main(sysargs):
     container: %(container)s
 
     steps:
-      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkkout .travis submodules
+      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
         run: sudo apt-get update && sudo apt-get install -y software-properties-common && sudo apt-get update && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git
-      - name: Before Checkout # need for actoins/checkout with ros-ubuntu container
+      - name: Before Checkout # need for actions/checkout with ros-ubuntu container
         run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
-      - name: Chcekout
+      - name: Checkout
         uses: %(checkout)s
       - name: Run jsk_travis
         uses: jsk-ros-pkg/jsk_travis@master
@@ -77,6 +77,29 @@ def main(sysargs):
           apt update -q && apt install -y -q python3
           python3 -m compileall .
 ''' % locals())
+    # python2 test
+    print("Generate python2.yml")
+    with open('python2.yml', mode='w') as f:
+        f.write('''# generated by `%(program)s`
+# jsk_travis
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: check_python2
+
+    container: ubuntu:20.04
+
+    steps:
+      - name: Chcekout
+        uses: actions/checkout@v2
+      - name: Check python2
+        run: |
+          apt update -q && apt install -y -q python2
+          python2 -m compileall .
+''' % locals())
+
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv[1:]) or 0)
diff --git a/.travis/.github/workflows/indigo.yml b/.travis/.github/workflows/indigo.yml
@@ -14,11 +14,17 @@ jobs:
     container: jskrobotics/ros-ubuntu:14.04
 
     steps:
-      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkkout .travis submodules
+      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
         run: sudo apt-get update && sudo apt-get install -y software-properties-common && sudo apt-get update && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git
-      - name: Before Checkout # need for actoins/checkout with ros-ubuntu container
-        run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
-      - name: Chcekout
+      - name: work around permission issue  # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
+        run: |
+          set -x
+          export USER=$(whoami)
+          git config --global --add safe.directory $GITHUB_WORKSPACE || echo "OK" # Show 'could not lock config file /github/home/.gitconfig: Permission denied', but it is ok
+          sudo mkdir -p /__w/
+          sudo chmod 777 -R /__w/
+          sudo chown -R $USER $HOME
+      - name: Checkout
         uses: actions/checkout@v2
       - name: Run jsk_travis
         uses: ./

diff --git a/.travis/.github/workflows/kinetic.yml b/.travis/.github/workflows/kinetic.yml
@@ -14,11 +14,17 @@ jobs:
     container: jskrobotics/ros-ubuntu:16.04
 
     steps:
-      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkkout .travis submodules
+      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
         run: sudo apt-get update && sudo apt-get install -y software-properties-common && sudo apt-get update && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git
-      - name: Before Checkout # need for actoins/checkout with ros-ubuntu container
-        run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
-      - name: Chcekout
+      - name: work around permission issue  # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
+        run: |
+          set -x
+          export USER=$(whoami)
+          git config --global --add safe.directory $GITHUB_WORKSPACE || echo "OK" # Show 'could not lock config file /github/home/.gitconfig: Permission denied', but it is ok
+          sudo mkdir -p /__w/
+          sudo chmod 777 -R /__w/
+          sudo chown -R $USER $HOME
+      - name: Checkout
         uses: actions/checkout@v2
       - name: Run jsk_travis
         uses: ./

diff --git a/.travis/.github/workflows/main.yml b/.travis/.github/workflows/main.yml
@@ -21,6 +21,7 @@ jobs:
           ADDITIONAL_ENV_TO_DOCKER: 'TEST_VAR1 TEST_VAR2'
           USE_JENKINS: true
           ROS_DISTRO : hydro
+          TIMEOUT_JENKINS: 60
 
   jenkins_indigo:
     name: jenkins_indigo
@@ -37,6 +38,7 @@ jobs:
           ADDITIONAL_ENV_TO_DOCKER: 'TEST_VAR1 TEST_VAR2'
           USE_JENKINS: true
           ROS_DISTRO : indigo
+          TIMEOUT_JENKINS: 60
 
   jenkins_kinetic:
     name: jenkins_kinetic
@@ -53,6 +55,7 @@ jobs:
           ADDITIONAL_ENV_TO_DOCKER: 'TEST_VAR1 TEST_VAR2'
           USE_JENKINS: true
           ROS_DISTRO : kinetic
+          TIMEOUT_JENKINS: 60
 
   jenkins_kinetic_pcl:
     name: jenkins_kinetic_pcl
@@ -70,6 +73,7 @@ jobs:
           USE_JENKINS: true
           ROS_DISTRO : kinetic
           DOCKER_IMAGE_JENKINS : ros-ubuntu:16.04-pcl
+          TIMEOUT_JENKINS: 60
 
   jenkins_melodic:
     name: jenkins_melodic
@@ -86,6 +90,7 @@ jobs:
           ADDITIONAL_ENV_TO_DOCKER: 'TEST_VAR1 TEST_VAR2'
           USE_JENKINS: true
           ROS_DISTRO : melodic
+          TIMEOUT_JENKINS: 60
 
   jenkins_melodic_pcl:
     name: jenkins_melodic_pcl
@@ -103,6 +108,7 @@ jobs:
           USE_JENKINS: true
           ROS_DISTRO : melodic
           DOCKER_IMAGE_JENKINS : ros-ubuntu:18.04-pcl
+          TIMEOUT_JENKINS: 60
 
   jenkins_noetic:
     name: jenkins_noetic
@@ -119,6 +125,7 @@ jobs:
           ADDITIONAL_ENV_TO_DOCKER: 'TEST_VAR1 TEST_VAR2'
           USE_JENKINS: true
           ROS_DISTRO : noetic
+          TIMEOUT_JENKINS: 60
 
   jenkins_noetic_pcl:
     name: jenkins_noetic_pcl
@@ -136,6 +143,7 @@ jobs:
           USE_JENKINS: true
           ROS_DISTRO : noetic
           DOCKER_IMAGE_JENKINS : ros-ubuntu:20.04-pcl
+          TIMEOUT_JENKINS: 60
 
   hydro:
     name: hydro
@@ -247,6 +255,33 @@ jobs:
           ROS_DISTRO : melodic
           ROS_REPOSITORY_PATH : http://packages.ros.org/ros/ubuntu
 
+  # since https://github.blog/2021-09-01-improving-git-protocol-security-github/ we can not use git://
+  # we need to remove git:// from submodules and .rosinstall
+  melodic_unencrypted_git_protocol:
+    name: melodic_unencrypted_git_protocol
+    runs-on: ubuntu-latest
+    container : ubuntu:18.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+      - name: Add pr2eus repository to .travis.rosinstall
+        run: |
+          echo "- git:" >> .travis.rosinstall
+          echo "    local-name: jsk-ros-pkg/jsk_pr2eus" >> .travis.rosinstall
+          echo "    uri: https://github.com/jsk-ros-pkg/jsk_pr2eus.git" >> .travis.rosinstall
+          echo "    version: a228cc7d3bb5b26b92ed25c7d55f32a64d9d7825"  >> .travis.rosinstall
+          pwd
+          ls -al
+          cat .travis.rosinstall
+      - name: Run jsk_travis
+        uses: ./
+        with:
+          ROS_DISTRO : melodic
+          USE_DEB : false
+          TEST_PKGS : ""
+
   noetic:
     name: noetic
     runs-on: ubuntu-latest
@@ -334,8 +369,14 @@ jobs:
     runs-on: ubuntu-latest
     container: jskrobotics/ros-ubuntu:20.04
     steps:
-      - name: Before Checkout # need for actoins/checkout with ros-ubuntu container
-        run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
+      - name: work around permission issue  # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
+        run: |
+          set -x
+          export USER=$(whoami)
+          git config --global --add safe.directory $GITHUB_WORKSPACE || echo "OK" # Show 'could not lock config file /github/home/.gitconfig: Permission denied', but it is ok
+          sudo mkdir -p /__w/
+          sudo chmod 777 -R /__w/
+          sudo chown -R $USER $HOME
       - name: Checkout
         uses: actions/checkout@v2
         with:

diff --git a/.travis/.github/workflows/melodic.yml b/.travis/.github/workflows/melodic.yml
@@ -14,11 +14,17 @@ jobs:
     container: jskrobotics/ros-ubuntu:18.04
 
     steps:
-      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkkout .travis submodules
+      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
         run: sudo apt-get update && sudo apt-get install -y software-properties-common && sudo apt-get update && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git
-      - name: Before Checkout # need for actoins/checkout with ros-ubuntu container
-        run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
-      - name: Chcekout
+      - name: work around permission issue  # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
+        run: |
+          set -x
+          export USER=$(whoami)
+          git config --global --add safe.directory $GITHUB_WORKSPACE || echo "OK" # Show 'could not lock config file /github/home/.gitconfig: Permission denied', but it is ok
+          sudo mkdir -p /__w/
+          sudo chmod 777 -R /__w/
+          sudo chown -R $USER $HOME
+      - name: Checkout
         uses: actions/checkout@v2
       - name: Run jsk_travis
         uses: ./

diff --git a/.travis/.github/workflows/noetic.yml b/.travis/.github/workflows/noetic.yml
@@ -14,11 +14,17 @@ jobs:
     container: jskrobotics/ros-ubuntu:20.04
 
     steps:
-      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkkout .travis submodules
+      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
         run: sudo apt-get update && sudo apt-get install -y software-properties-common && sudo apt-get update && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git
-      - name: Before Checkout # need for actoins/checkout with ros-ubuntu container
-        run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
-      - name: Chcekout
+      - name: work around permission issue  # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
+        run: |
+          set -x
+          export USER=$(whoami)
+          git config --global --add safe.directory $GITHUB_WORKSPACE || echo "OK" # Show 'could not lock config file /github/home/.gitconfig: Permission denied', but it is ok
+          sudo mkdir -p /__w/
+          sudo chmod 777 -R /__w/
+          sudo chown -R $USER $HOME
+      - name: Checkout
         uses: actions/checkout@v2
       - name: Run jsk_travis
         uses: ./

diff --git a/.travis/.github/workflows/python2.yml b/.travis/.github/workflows/python2.yml
@@ -0,0 +1,18 @@
+# generated by `generate_action_config.py noetic .`
+# jsk_travis
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: check_python2
+
+    container: ubuntu:20.04
+
+    steps:
+      - name: Chcekout
+        uses: actions/checkout@v2
+      - name: Check python2
+        run: |
+          apt update -q && apt install -y -q python2
+          python2 -m compileall .