projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a687354
)
travis-ci: disable tests for osx.
author
Kim Kulling
<kim.kulling@googlemail.com>
Wed, 7 Jun 2017 08:30:40 +0000
(10:30 +0200)
committer
Kim Kulling
<kim.kulling@googlemail.com>
Wed, 7 Jun 2017 08:30:40 +0000
(10:30 +0200)
.travis.sh
patch
|
blob
|
history
diff --git
a/.travis.sh
b/.travis.sh
index
c285285
..
65f5573
100755
(executable)
--- a/
.travis.sh
+++ b/
.travis.sh
@@
-5,7
+5,8
@@
function generate()
if [ $ANDROID ]; then
ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni
-else
+fi
+if [ $LINUX ]; then
generate \
&& make -j4 \
&& sudo make install \