Merge branch 'master' into indigo

jsk-ros-pkg · May 11, 2024 · 600386b · 600386b
2 parents 416c6c5 + b223c88
commit 600386b
Show file tree

Hide file tree

Showing 22 changed files with 112 additions and 50 deletions.
diff --git a/.github/workflows/generate_action_config.py b/.github/workflows/generate_action_config.py
@@ -23,7 +23,7 @@ def main(sysargs):
 
     for distro in distros:
         print("Generate {}.yml".format(distro))
-        checkout = defaultdict(lambda: 'actions/checkout@v2',hydro='actions/checkout@v1')[distro]
+        checkout = defaultdict(lambda: 'actions/checkout@v3.0.2',hydro='actions/checkout@v1')[distro]
         container = defaultdict(lambda: 'jskrobotics/ros-ubuntu:18.04',
                                 hydro  = 'jskrobotics/ros-ubuntu:12.04',
                                 indigo = 'jskrobotics/ros-ubuntu:14.04',
@@ -43,7 +43,7 @@ def main(sysargs):
     container: %(container)s
 
     steps:
-      - 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
+      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v3.0.2 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 actions/checkout with ros-ubuntu container
         run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
@@ -71,7 +71,7 @@ def main(sysargs):
 
     steps:
       - name: Chcekout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
       - name: Check Python3
         run: |
           apt update -q && apt install -y -q python3
@@ -93,7 +93,7 @@ def main(sysargs):
 
     steps:
       - name: Chcekout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
       - name: Check python2
         run: |
           apt update -q && apt install -y -q python2

diff --git a/.github/workflows/indigo.yml b/.github/workflows/indigo.yml
@@ -14,7 +14,7 @@ jobs:
     container: jskrobotics/ros-ubuntu:14.04
 
     steps:
-      - 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
+      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v3.0.2 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: work around permission issue  # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
         run: |
@@ -25,7 +25,7 @@ jobs:
           sudo chmod 777 -R /__w/
           sudo chown -R $USER $HOME
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
       - name: Run jsk_travis
         uses: ./
         with:

diff --git a/.github/workflows/kinetic.yml b/.github/workflows/kinetic.yml
@@ -14,7 +14,7 @@ jobs:
     container: jskrobotics/ros-ubuntu:16.04
 
     steps:
-      - 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
+      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v3.0.2 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: work around permission issue  # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
         run: |
@@ -25,7 +25,7 @@ jobs:
           sudo chmod 777 -R /__w/
           sudo chown -R $USER $HOME
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
       - name: Run jsk_travis
         uses: ./
         with:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
     container: ubuntu:18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -29,7 +29,7 @@ jobs:
     container: ubuntu:18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -46,7 +46,7 @@ jobs:
     container: ubuntu:18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -63,7 +63,7 @@ jobs:
     container: ubuntu:18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -81,7 +81,7 @@ jobs:
     container: ubuntu:18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -98,7 +98,7 @@ jobs:
     container: ubuntu:18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -116,7 +116,7 @@ jobs:
     container: ubuntu:18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -133,7 +133,7 @@ jobs:
     container: ubuntu:18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -166,7 +166,7 @@ jobs:
     container: ubuntu:14.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
            fetch-depth: 2
       - name: Run jsk_travis
@@ -181,7 +181,7 @@ jobs:
     container: ubuntu:16.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -196,7 +196,7 @@ jobs:
     container: ubuntu:18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -211,7 +211,7 @@ jobs:
     container: ubuntu:18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -229,7 +229,7 @@ jobs:
     container : ubuntu:18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -245,7 +245,7 @@ jobs:
     container : ubuntu:18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -263,7 +263,7 @@ jobs:
     container : ubuntu:18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Add pr2eus repository to .travis.rosinstall
@@ -288,7 +288,7 @@ jobs:
     container : ubuntu:20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -303,7 +303,7 @@ jobs:
     container : ubuntu:20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -322,7 +322,7 @@ jobs:
     container: ubuntu:20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -340,7 +340,7 @@ jobs:
       - name: Before Checkout # need for actoins/checkout with ros-ubuntu container
         run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
       - name: Run jsk_travis
         uses: ./
         with:
@@ -355,7 +355,7 @@ jobs:
       - name: Before Checkout # need for actoins/checkout with ros-ubuntu container
         run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -378,7 +378,7 @@ jobs:
           sudo chmod 777 -R /__w/
           sudo chown -R $USER $HOME
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Run jsk_travis
@@ -392,7 +392,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 2
       - name: Check python3

diff --git a/.github/workflows/melodic.yml b/.github/workflows/melodic.yml
@@ -14,7 +14,7 @@ jobs:
     container: jskrobotics/ros-ubuntu:18.04
 
     steps:
-      - 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
+      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v3.0.2 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: work around permission issue  # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
         run: |
@@ -25,7 +25,7 @@ jobs:
           sudo chmod 777 -R /__w/
           sudo chown -R $USER $HOME
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
       - name: Run jsk_travis
         uses: ./
         with:

diff --git a/.github/workflows/noetic.yml b/.github/workflows/noetic.yml
@@ -14,7 +14,7 @@ jobs:
     container: jskrobotics/ros-ubuntu:20.04
 
     steps:
-      - 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
+      - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v3.0.2 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: work around permission issue  # https://github.com/actions/checkout/issues/760#issuecomment-1097501613
         run: |
@@ -25,7 +25,7 @@ jobs:
           sudo chmod 777 -R /__w/
           sudo chown -R $USER $HOME
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
       - name: Run jsk_travis
         uses: ./
         with:

diff --git a/.github/workflows/python2.yml b/.github/workflows/python2.yml
@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Chcekout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
       - name: Check python2
         run: |
           apt update -q && apt install -y -q python2

diff --git a/.github/workflows/python3.yml b/.github/workflows/python3.yml
@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Chcekout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.2
       - name: Check Python3
         run: |
           apt update -q && apt install -y -q python3

diff --git a/.travis.yml b/.travis.yml
@@ -86,11 +86,12 @@ matrix:
 before_script:
   - find $HOME/.ccache    -type f
   - find $HOME/.cache/pip -type f
-  - export ROSDEP_ADDITIONAL_OPTIONS='-n -v --ignore-src' # run rosdep without -q, -r and -v
+  - export ROSDEP_ADDITIONAL_OPTIONS='-n -r -v --ignore-src' # run rosdep without -q. FIXME: we want to remove -r to notice rosdep errors, but we currently cannot avoid errors on 'sudo -H pip install -U fcn/chainercv/chainer' because it tries to upgrade all dependencies on pip 9.0.3 (default upgrade-strategy: eager). Upgrading chainer and protobuf fails because they release incompatible versions to Python2 (https://github.com/chainer/chainer/issues/8545, https://github.com/protocolbuffers/protobuf/issues/8984)
   - if [ ${ROS_DISTRO} == "hydro" ]; then export BEFORE_SCRIPT="sed -ie \"/-pip/ d\" \${CI_SOURCE_PATH}/package.xml;${BEFORE_SCRIPT}"; fi # FIXME hydro does not have python >= 2.7.9, so it fails on pip install
+  - if [[ ${ROS_DISTRO} > "hydro" ]] && [[ ${ROS_DISTRO} < "noetic" ]]; then export BEFORE_SCRIPT="sudo -E apt-get -y -qq install python-dev python-numpy; sudo -H pip install fcn chainercv chainer==6.7.0 protobuf==3.17.3;${BEFORE_SCRIPT}"; fi # FIXME fcn, chainercv, and chainer cannot be installed via rosdep install using pip 9.0.3 ('sudo -H pip install -U fcn/chainercv/chainer' and its upgrade-strategy is eager) on Python 2. That command tries to upgrade all dependencies, but upgrading chainer and protobuf fails because they release incompatible versions to Python2 (https://github.com/chainer/chainer/issues/8545, https://github.com/protocolbuffers/protobuf/issues/8984)
   - if [ ${ROS_DISTRO} == "noetic" ]; then export BEFORE_SCRIPT="sed -ie \"/gazebo/ d\" \${CI_SOURCE_PATH}/package.xml;${BEFORE_SCRIPT}"; fi # FIXME gazebo is not released in noetic
   - if [ ${ROS_DISTRO} == "noetic" ]; then export BEFORE_SCRIPT="touch ros_tutorials/turtlesim/CATKIN_IGNORE; ${BEFORE_SCRIPT}"; fi # qt5/moc does not work on docker (https://stackoverflow.com/questions/56319830/error-when-building-qt-app-in-a-recent-docker)
-  - mkdir .travis; mv *.sh *.py *.conf .travis/ # need to move, since directory starting from . is ignoreed by catkin build
+  - mkdir .travis; mv *.sh *.py *.conf rosdep_snapshots .travis/ # need to move, since directory starting from . is ignoreed by catkin build
   - export BEFORE_SCRIPT="rm -fr jsk_travis/CATKIN_IGNORE; git clone https://github.com/ros/ros_tutorials -b ${ROS_DISTRO}-devel;${BEFORE_SCRIPT}"
   - if [ "${USE_CATKIN_MAKE}" == "true" ] ;then sed -i 's@catkin build -i -v --limit-status-rate 0.001@catkin_make@' .travis/travis.sh; fi
   - if [ "${USE_CATKIN_MAKE}" == "true" ] ;then sed -i 's@catkin run_tests --no-deps --limit-status-rate 0.001@catkin_make run_tests@' .travis/travis.sh; fi

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,38 @@
 Changelog for package jsk_travis
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.5.27 (2024-01-15)
+-------------------
+* Use snapshot of rosdep list on melodic (`#457 <https://github.com/jsk-ros-pkg/jsk_travis/issues/457>`_)
+
+  * Move rosdep_snapshots as well as travis.sh to use rosdep_snapshots in travis.sh
+  * Use snapshot of rosdep list on melodic
+    After https://github.com/ros/rosdistro/pull/39174 was merged, rosdep key 'python-omniorb' cannot be resolved on melodic
+  * Include snapshot of rosdep list in this repository
+
+* Contributors: Shun Hasegawa
+
+0.5.26 (2023-08-10)
+-------------------
+* suppress test warning in catkin run_tests (`#448 <https://github.com/jsk-ros-pkg/jsk_travis/issues/448>`_)
+* fix dockerhub (`#456 <https://github.com/jsk-ros-pkg/jsk_travis/issues/456>`_)
+
+  * fix dockerfile as same as .travis.yml fix at 'Fix chainer and protobuf versions on travis because they release incompatible versions to Python2, b779159'
+  * docker: specify dlib version
+
+* Fix CI (`#455 <https://github.com/jsk-ros-pkg/jsk_travis/issues/455>`_)
+
+  * Install python-dev and python-numpy to install chainercv on travis docker
+  * Skip errors from rosdep install on travis as well as github actions
+  * We cannot fix chainer and protobuf versions. What we have to do here is to make fcn/chainercv/chainer installed even though rosdep install of them fails
+  * Fix chainer and protobuf versions on travis because they release incompatible versions to Python2
+    - https://github.com/chainer/chainer/issues/8545
+    - https://github.com/protocolbuffers/protobuf/issues/8984
+  * Use checkout@v1 on hydro
+  * use [email protected]
+
+* Contributors: Kei Okada, Shingo Kitagawa, Shun Hasegawa
+
 0.5.25 (2022-05-13)
 -------------------
 * add CATKNI_IGNORE, whcih is wrongly removed in 728c456

diff --git a/action.yml b/action.yml
@@ -190,7 +190,7 @@ runs:
           if [ "${ROS_DISTRO}" == "hydro" ]; then export BEFORE_SCRIPT="sed -ie \"/-pip/ d\" \${CI_SOURCE_PATH}/package.xml;${BEFORE_SCRIPT}"; fi # FIXME hydro does not have python >= 2.7.9, so it fails on pip install
           if [ "${ROS_DISTRO}" == "noetic" ]; then export BEFORE_SCRIPT="sed -ie \"/gazebo/ d\" \${CI_SOURCE_PATH}/package.xml;${BEFORE_SCRIPT}"; fi # FIXME gazebo is not released in noetic
           if [ "${ROS_DISTRO}" == "noetic" ]; then export BEFORE_SCRIPT="touch ros_tutorials/turtlesim/CATKIN_IGNORE; ${BEFORE_SCRIPT}"; fi # qt5/moc does not work on docker (https://stackoverflow.com/questions/56319830/error-when-building-qt-app-in-a-recent-docker)
-          mkdir .travis; mv *.sh *.py *.conf .travis/ # need to move, since directory starting from . is ignoreed by catkin build
+          mkdir .travis; mv *.sh *.py *.conf rosdep_snapshots .travis/ # need to move, since directory starting from . is ignoreed by catkin build
           export BEFORE_SCRIPT="rm -fr jsk_travis/CATKIN_IGNORE; git clone https://github.com/ros/ros_tutorials -b ${ROS_DISTRO}-devel;${BEFORE_SCRIPT}"
           if [ "${USE_CATKIN_MAKE}" == "true" ] ;then sed -i 's@catkin build -i -v --limit-status-rate 0.001@catkin_make@' .travis/travis.sh; fi
           if [ "${USE_CATKIN_MAKE}" == "true" ] ;then sed -i 's@catkin run_tests --no-deps --limit-status-rate 0.001@catkin_make run_tests@' .travis/travis.sh; fi

diff --git a/docker/Dockerfile.ros-ubuntu:14.04-pcl b/docker/Dockerfile.ros-ubuntu:14.04-pcl
@@ -54,7 +54,7 @@ RUN sudo apt-get update && \
 
 # fix latest pip install fcn errors
 RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | sudo python -; sudo -H pip install 'pip<10'
-RUN sudo pip install fcn chainercv chainer==6.7.0 cupy-cuda91 decorator==4.4.2
+RUN sudo pip install fcn chainercv chainer==6.7.0 protobuf==3.17.3 cupy-cuda91 decorator==4.4.2
 
 # install package to speedup
 RUN sudo pip install freezegun