From 8ff140d4ac5dec4803137b7d9427f6c3fba33f99 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 11 Jun 2021 10:32:06 +0900 Subject: [PATCH] force run 'rosdep update --include-eol-distros' until https://github.com/ros-infrastructure/ros_buildfarm/pull/684 released --- .travis.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2efe76f..25e3dfe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: - ABORT_ON_TEST_FAILURE=1 - INDEX_URL=https://raw.githubusercontent.com/ros-infrastructure/ros_buildfarm_config/production/index.yaml matrix: -# - ROS_DISTRO_NAME=kinetic OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64 INDEX_URL=https://raw.githubusercontent.com/ros-infrastructure/ros_buildfarm_config/6a93d17/index.yaml + - ROS_DISTRO_NAME=kinetic OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64 INDEX_URL=https://raw.githubusercontent.com/ros-infrastructure/ros_buildfarm_config/7e6385e/index.yaml - ROS_DISTRO_NAME=melodic OS_NAME=ubuntu OS_CODE_NAME=bionic ARCH=amd64 - ROS_DISTRO_NAME=noetic OS_NAME=ubuntu OS_CODE_NAME=focal ARCH=amd64 matrix: @@ -24,10 +24,13 @@ install: # check python3 compatibility - if [ "${CHECK_PYTHON3_COMPILE}" == "true" ]; then python3 -m compileall -x asmach .; exit $?; fi # either install the latest released version of ros_buildfarm - - pip install ros_buildfarm + # - pip install ros_buildfarm # or checkout a specific branch - #- git clone -b master https://github.com/ros-infrastructure/ros_buildfarm /tmp/ros_buildfarm - #- pip install /tmp/ros_buildfarm + - git clone -b master https://github.com/ros-infrastructure/ros_buildfarm /tmp/ros_buildfarm + # force enable `rosdep update --include-eol-distros` until https://github.com/ros-infrastructure/ros_buildfarm/pull/684 released + - (cd /tmp; wget https://github.com/ros-infrastructure/ros_buildfarm/pull/684.diff) + - (cd /tmp/ros_buildfarm; patch -p1 < /tmp/684.diff) + - pip install /tmp/ros_buildfarm # checkout catkin for catkin_test_results script - git clone https://github.com/ros/catkin /tmp/catkin # run devel job for a ROS repository with the same name as this repo @@ -36,7 +39,7 @@ install: - mkdir -p $JOB_PATH/ws/src - cp -R $TRAVIS_BUILD_DIR $JOB_PATH/ws/src/ # generate the script to run a pre-release job for that target and repo - - generate_prerelease_script.py $INDEX_URL $ROS_DISTRO_NAME default $OS_NAME $OS_CODE_NAME $ARCH --output-dir $JOB_PATH + - generate_prerelease_script.py $INDEX_URL $ROS_DISTRO_NAME default $OS_NAME $OS_CODE_NAME $ARCH --output-dir $JOB_PATH --custom-rosdep-update-options=--include-eol-distros # run the actual job which involves Docker - cd $JOB_PATH; sh ./prerelease.sh -y script: