From 2ce08923ad66967228f277fd6c6e8970f832be58 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 1 Nov 2019 10:09:53 +0000 Subject: [PATCH 1/5] travis.sh: install libbullet-dev for jskeus tests --- .travis.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index cffda89cb..65a245fa1 100755 --- a/.travis.sh +++ b/.travis.sh @@ -28,7 +28,7 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then travis_time_end travis_time_start setup.apt-get_install - ret=1; while [ $ret != 0 ]; do sudo apt-get install -qq -y git make gcc g++ libjpeg-dev libxext-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev libpq-dev libpng-dev xfonts-100dpi xfonts-75dpi && ret=0 || echo "failed, retry"; done # msttcorefonts could not install on 14.04 travis + ret=1; while [ $ret != 0 ]; do sudo apt-get install -qq -y git make gcc g++ libjpeg-dev libxext-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev libpq-dev libpng-dev xfonts-100dpi xfonts-75dpi libbullet-dev && ret=0 || echo "failed, retry"; done # msttcorefonts could not install on 14.04 travis if [ "`uname -m`" == "x86_64" ] ; then sudo apt-get install -qq -y texlive-latex-base ptex-bin latex2html nkf poppler-utils || echo "ok"; fi # 16.04 does ont have ptex bin travis_time_end @@ -41,6 +41,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew list jpeg &>/dev/null || brew install jpeg brew list libpng &>/dev/null || brew install libpng brew list mesalib-glw &>/dev/null || brew install mesalib-glw + brew list libbullet-dev &>/dev/null || brew install libbullet-dev travis_time_end fi From f2792ccd1429462f23cea0f3336159c3a83d3887 Mon Sep 17 00:00:00 2001 From: Masaki Murooka Date: Fri, 1 Nov 2019 20:11:19 +0900 Subject: [PATCH 2/5] install pkg-config. skip collision test for old bullet. --- .travis.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index 65a245fa1..7278113b8 100755 --- a/.travis.sh +++ b/.travis.sh @@ -28,7 +28,7 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then travis_time_end travis_time_start setup.apt-get_install - ret=1; while [ $ret != 0 ]; do sudo apt-get install -qq -y git make gcc g++ libjpeg-dev libxext-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev libpq-dev libpng-dev xfonts-100dpi xfonts-75dpi libbullet-dev && ret=0 || echo "failed, retry"; done # msttcorefonts could not install on 14.04 travis + ret=1; while [ $ret != 0 ]; do sudo apt-get install -qq -y git make gcc g++ libjpeg-dev libxext-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev libpq-dev libpng-dev xfonts-100dpi xfonts-75dpi pkg-config libbullet-dev && ret=0 || echo "failed, retry"; done # msttcorefonts could not install on 14.04 travis if [ "`uname -m`" == "x86_64" ] ; then sudo apt-get install -qq -y texlive-latex-base ptex-bin latex2html nkf poppler-utils || echo "ok"; fi # 16.04 does ont have ptex bin travis_time_end @@ -172,6 +172,9 @@ fi for test_l in irteus/test/*.l; do [[ ("`uname -m`" == "arm"* || "`uname -m`" == "aarch"*) && $test_l =~ geo.l|mathtest.l|interpolator.l|test-irt-motion.l|test-pointcloud.l|irteus-demo.l ]] && continue; + # skip collision test because bullet of 2.83 or later version is not released in trusty and jessie. + # https://github.com/euslisp/jskeus/blob/6cb08aa6c66fa8759591de25b7da68baf76d5f09/irteus/Makefile#L37 + [[ ( "$DOCKER_IMAGE" == *"trusty"* || "$DOCKER_IMAGE" == *"jessie"* ) && $test_l =~ test-collision.l ]] && continue; travis_time_start irteus.${test_l##*/}.test From 5f664da9af6a665a2adc116b5bfc4024227ca29d Mon Sep 17 00:00:00 2001 From: Masaki Murooka Date: Fri, 1 Nov 2019 22:35:20 +0900 Subject: [PATCH 3/5] fix osx bullet install. --- .travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index 7278113b8..3629416cb 100755 --- a/.travis.sh +++ b/.travis.sh @@ -41,7 +41,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew list jpeg &>/dev/null || brew install jpeg brew list libpng &>/dev/null || brew install libpng brew list mesalib-glw &>/dev/null || brew install mesalib-glw - brew list libbullet-dev &>/dev/null || brew install libbullet-dev + brew list bullet &>/dev/null || brew install bullet travis_time_end fi From 7d5ada74072fae0066e62b6e984ae442ac323c20 Mon Sep 17 00:00:00 2001 From: Masaki Murooka Date: Sat, 2 Nov 2019 00:26:25 +0900 Subject: [PATCH 4/5] set HOMEBREW_NO_AUTO_UPDATE for osx brew: ref https://travis-ci.community/t/syntax-error-unexpected-keyword-rescue-expecting-keyword-end-in-homebrew/5623 --- .travis.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.sh b/.travis.sh index 3629416cb..465ccbae5 100755 --- a/.travis.sh +++ b/.travis.sh @@ -38,10 +38,10 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then # skip if already installed # https://discourse.brew.sh/t/skip-ignore-brew-install-if-package-is-already-installed/633/2 # brew install jpeg libpng mesalib-glw; - brew list jpeg &>/dev/null || brew install jpeg - brew list libpng &>/dev/null || brew install libpng - brew list mesalib-glw &>/dev/null || brew install mesalib-glw - brew list bullet &>/dev/null || brew install bullet + brew list jpeg &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install jpeg + brew list libpng &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install libpng + brew list mesalib-glw &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install mesalib-glw + brew list bullet &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install bullet travis_time_end fi From 11fc0a9f528981ce557cb6806f0c4c91b81abaa3 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sat, 2 Nov 2019 00:44:57 +0000 Subject: [PATCH 5/5] add more comments --- .travis.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.sh b/.travis.sh index 465ccbae5..fadb9aa86 100755 --- a/.travis.sh +++ b/.travis.sh @@ -38,6 +38,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then # skip if already installed # https://discourse.brew.sh/t/skip-ignore-brew-install-if-package-is-already-installed/633/2 # brew install jpeg libpng mesalib-glw; + # use HOMEBREW_NO_AUT_UPDATE to fix unexpected keyword error https://travis-ci.community/t/syntax-error-unexpected-keyword-rescue-expecting-keyword-end-in-homebrew/5623 brew list jpeg &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install jpeg brew list libpng &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install libpng brew list mesalib-glw &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install mesalib-glw