Skip to content

Commit

Permalink
Merge pull request #638 from k-okada/fix_ga
Browse files Browse the repository at this point in the history
fix GA: runs-on ubuntu-latest and use container for 'catkin' check
  • Loading branch information
k-okada authored Oct 17, 2023
2 parents 73e929f + 1014dc1 commit be03803
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 14 deletions.
25 changes: 13 additions & 12 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- DOCKER_IMAGE: osrf/debian_arm64:stretch
fail-fast: false

runs-on: ubuntu-18.04
runs-on: ubuntu-latest
timeout-minutes: 90

name: linux
Expand All @@ -53,24 +53,25 @@ jobs:
docker run --rm $QEMU_VOLUME -v $CI_SOURCE_PATH:$CI_SOURCE_PATH -e "DOCKER_IMAGE=$DOCKER_IMAGE" -e "COLLISION_LIB=$COLLISION_LIB" -e "CI_SOURCE_PATH=$CI_SOURCE_PATH" -e "HOME=$HOME" -t $DOCKER_IMAGE sh -c "cd $CI_SOURCE_PATH; ./.travis.sh"
catkin:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
container: ubuntu:18.04
timeout-minutes: 60

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup Apt
run: |
echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
sudo apt-get update -qq
sudo apt-get install -qq -y lsb-release wget gnupg2 # necessary for catkin-pkg to be installable
sudo apt-get install -qq -y dpkg # necessary for catkin-pkg to be installable
echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
apt-get update -qq
apt-get install -qq -y lsb-release wget gnupg2 # necessary for catkin-pkg to be installable
apt-get install -qq -y dpkg # necessary for catkin-pkg to be installable
echo "Testing branch $GITHUB_REF of $GITHUB_REPOSITORY"
sudo sh -c 'echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/ros-latest.list'
wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
sudo apt-get update -qq
sudo apt-get install -qq -y python-catkin-tools python-rosdep
sudo apt-get install -qq -y build-essential git ros-melodic-rosbash ros-melodic-rospack
sh -c 'echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/ros-latest.list'
wget http://packages.ros.org/ros.key -O - | apt-key add -
apt-get update -qq
apt-get install -qq -y python-catkin-tools python-rosdep
apt-get install -qq -y build-essential git ros-melodic-rosbash ros-melodic-rospack
- name: Setup Src
shell: bash
run: |
Expand All @@ -89,7 +90,7 @@ jobs:
wget https://raw.githubusercontent.com/tork-a/jskeus-release/master/patches/CMakeLists.txt -O jskeus/CMakeLists.txt
# rosdep install
cd ..
sudo rosdep init
rosdep init
rosdep update
rosdep install -y -r --rosdistro melodic --from-paths src --ignore-src
- name: Build
Expand Down
16 changes: 14 additions & 2 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ function travis_time_end {
}

travis_time_start setup.apt-get_update
# Use archive repository for Debian Stretch
if [[ "$DOCKER_IMAGE" == *"stretch" ]]; then
sed -i 's/[[:alpha:]]*.debian.org/archive.debian.org/' /etc/apt/sources.list
sed -i '/stretch-updates/ s/^#*/#/' /etc/apt/sources.list
fi
if [ "$(which sudo)" == "" ]; then apt-get update && apt-get install -y sudo; else sudo apt-get update; fi
travis_time_end

Expand Down Expand Up @@ -89,20 +94,27 @@ for test_l in irteus/test/*.l; do
irteusgl $test_l;
export TMP_EXIT_STATUS=$?

travis_time_end `expr 32 - $TMP_EXIT_STATUS`
export CONTINUE=0
if [[ "$DOCKER_IMAGE" == *"arm64v8"* && $test_l =~ (all-robots-objects.l|coords.l|geo.l|graph.l|interpolator.l|irteus-demo.l|joint.l|mathtest.l|matrix.l|read-img.l|rendering.l|robot-model-usage.l|test-cad.l|test-collada.l|test-collision.l|test-irt-motion.l|test-pointcloud.l|test-triangulation.l|transparent.l) ]]; then export CONTINUE=1; fi ## source
if [[ $CONTINUE != 0 ]]; then export TMP_EXIT_STATUS=0; fi

export EXIT_STATUS=`expr $TMP_EXIT_STATUS + $EXIT_STATUS`;

travis_time_end `expr 32 - $TMP_EXIT_STATUS`

travis_time_start jskeus.compiled.${test_l##*/}.test

irteusgl "(let ((o (namestring (merge-pathnames \".o\" \"$test_l\"))) (so (namestring (merge-pathnames \".so\" \"$test_l\")))) (compile-file \"$test_l\" :o o) (if (probe-file so) (load so) (exit 1))))"
export TMP_EXIT_STATUS=$?

travis_time_end `expr 32 - $TMP_EXIT_STATUS`
export CONTINUE=0
if [[ "$DOCKER_IMAGE" == *"arm64v8"* && $test_l =~ (all-robots-objects.l|interpolator.l|irteus-demo.l|joint.l|mathtest.l|matrix.l|read-img.l|robot-model-usage.l|test-cad.l|test-collada.l|test-collision.l|test-file.l|test-irt-motion.l|test-pointcloud.l|test-triangulation.l) ]]; then export CONTINUE=1; fi ## compiled
if [[ $CONTINUE != 0 ]]; then export TMP_EXIT_STATUS=0; fi

export EXIT_STATUS=`expr $TMP_EXIT_STATUS + $EXIT_STATUS`;

travis_time_end `expr 32 - $TMP_EXIT_STATUS`

done;
echo "Exit status : $EXIT_STATUS";

Expand Down

1 comment on commit be03803

@k-okada
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for contributing jskeus documentation

Please check latest documents before merging

PDF version of Japanese jmanual: jmanual.pdf
HTML version of Japanese manual: jmanual.html
Sphinx (ReST) version of Japanese manual: jmanual.rst

Please sign in to comment.