Skip to content

Commit be03803

Browse files
authored
Merge pull request #638 from k-okada/fix_ga
fix GA: runs-on ubuntu-latest and use container for 'catkin' check
2 parents 73e929f + 1014dc1 commit be03803

File tree

2 files changed

+27
-14
lines changed

2 files changed

+27
-14
lines changed

.github/workflows/config.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- DOCKER_IMAGE: osrf/debian_arm64:stretch
3131
fail-fast: false
3232

33-
runs-on: ubuntu-18.04
33+
runs-on: ubuntu-latest
3434
timeout-minutes: 90
3535

3636
name: linux
@@ -53,24 +53,25 @@ jobs:
5353
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"
5454
5555
catkin:
56-
runs-on: ubuntu-18.04
56+
runs-on: ubuntu-latest
57+
container: ubuntu:18.04
5758
timeout-minutes: 60
5859

5960
steps:
6061
- name: Checkout
6162
uses: actions/checkout@v2
6263
- name: Setup Apt
6364
run: |
64-
echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
65-
sudo apt-get update -qq
66-
sudo apt-get install -qq -y lsb-release wget gnupg2 # necessary for catkin-pkg to be installable
67-
sudo apt-get install -qq -y dpkg # necessary for catkin-pkg to be installable
65+
echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
66+
apt-get update -qq
67+
apt-get install -qq -y lsb-release wget gnupg2 # necessary for catkin-pkg to be installable
68+
apt-get install -qq -y dpkg # necessary for catkin-pkg to be installable
6869
echo "Testing branch $GITHUB_REF of $GITHUB_REPOSITORY"
69-
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'
70-
wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
71-
sudo apt-get update -qq
72-
sudo apt-get install -qq -y python-catkin-tools python-rosdep
73-
sudo apt-get install -qq -y build-essential git ros-melodic-rosbash ros-melodic-rospack
70+
sh -c 'echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/ros-latest.list'
71+
wget http://packages.ros.org/ros.key -O - | apt-key add -
72+
apt-get update -qq
73+
apt-get install -qq -y python-catkin-tools python-rosdep
74+
apt-get install -qq -y build-essential git ros-melodic-rosbash ros-melodic-rospack
7475
- name: Setup Src
7576
shell: bash
7677
run: |
@@ -89,7 +90,7 @@ jobs:
8990
wget https://raw.githubusercontent.com/tork-a/jskeus-release/master/patches/CMakeLists.txt -O jskeus/CMakeLists.txt
9091
# rosdep install
9192
cd ..
92-
sudo rosdep init
93+
rosdep init
9394
rosdep update
9495
rosdep install -y -r --rosdistro melodic --from-paths src --ignore-src
9596
- name: Build

.travis.sh

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ function travis_time_end {
2121
}
2222

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

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

92-
travis_time_end `expr 32 - $TMP_EXIT_STATUS`
97+
export CONTINUE=0
98+
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
99+
if [[ $CONTINUE != 0 ]]; then export TMP_EXIT_STATUS=0; fi
93100

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

103+
travis_time_end `expr 32 - $TMP_EXIT_STATUS`
96104

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

99107
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))))"
100108
export TMP_EXIT_STATUS=$?
101109

102-
travis_time_end `expr 32 - $TMP_EXIT_STATUS`
110+
export CONTINUE=0
111+
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
112+
if [[ $CONTINUE != 0 ]]; then export TMP_EXIT_STATUS=0; fi
103113

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

116+
travis_time_end `expr 32 - $TMP_EXIT_STATUS`
117+
106118
done;
107119
echo "Exit status : $EXIT_STATUS";
108120

0 commit comments

Comments
 (0)