Skip to content

Commit 22f9ebd

Browse files
committed
Use CentOS 6 (instead of 7) on Travis CI, whenever possible
1 parent c318465 commit 22f9ebd

File tree

3 files changed

+40
-11
lines changed

3 files changed

+40
-11
lines changed

.travis.yml

+22-2
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ matrix:
351351

352352
- jdk: oraclejdk8
353353
os: linux
354-
env: PROJ=opencv,chilitags,flandmark,openblas,mxnet,hdf5,caffe OS=linux-x86
354+
env: PROJ=opencv,flandmark,openblas,hdf5,caffe OS=linux-x86
355355
install: true
356356
script: ./ci/install-travis.sh
357357
- jdk: oraclejdk8
@@ -394,6 +394,11 @@ matrix:
394394
env: PROJ=artoolkitplus OS=linux-x86
395395
install: true
396396
script: ./ci/install-travis.sh
397+
- jdk: oraclejdk8
398+
os: linux
399+
env: PROJ=chilitags OS=linux-x86
400+
install: true
401+
script: ./ci/install-travis.sh
397402
- jdk: oraclejdk8
398403
os: linux
399404
env: PROJ=mkl OS=linux-x86
@@ -424,6 +429,11 @@ matrix:
424429
env: PROJ=cuda OS=linux-x86
425430
install: true
426431
script: ./ci/install-travis.sh
432+
- jdk: oraclejdk8
433+
os: linux
434+
env: PROJ=mxnet OS=linux-x86
435+
install: true
436+
script: ./ci/install-travis.sh
427437
- jdk: oraclejdk8
428438
os: linux
429439
env: PROJ=tensorflow OS=linux-x86
@@ -447,7 +457,7 @@ matrix:
447457

448458
- jdk: oraclejdk8
449459
os: linux
450-
env: PROJ=opencv,chilitags,flandmark,openblas,mxnet,hdf5,caffe OS=linux-x86_64
460+
env: PROJ=opencv,flandmark,openblas,hdf5,caffe OS=linux-x86_64
451461
install: true
452462
script: ./ci/install-travis.sh
453463
- jdk: oraclejdk8
@@ -490,6 +500,11 @@ matrix:
490500
env: PROJ=artoolkitplus OS=linux-x86_64
491501
install: true
492502
script: ./ci/install-travis.sh
503+
- jdk: oraclejdk8
504+
os: linux
505+
env: PROJ=chilitags OS=linux-x86_64
506+
install: true
507+
script: ./ci/install-travis.sh
493508
- jdk: oraclejdk8
494509
os: linux
495510
env: PROJ=mkl OS=linux-x86_64
@@ -520,6 +535,11 @@ matrix:
520535
env: PROJ=cuda OS=linux-x86_64
521536
install: true
522537
script: ./ci/install-travis.sh
538+
- jdk: oraclejdk8
539+
os: linux
540+
env: PROJ=mxnet OS=linux-x86_64
541+
install: true
542+
script: ./ci/install-travis.sh
523543
- jdk: oraclejdk8
524544
os: linux
525545
env: PROJ=tensorflow OS=linux-x86_64

README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,12 @@ Once everything installed and configured, simply execute
134134
```bash
135135
$ mvn install --projects .,opencv,ffmpeg,flycapture,libdc1394,libfreenect,videoinput,artoolkitplus,etc.
136136
```
137-
inside the directory containing the parent `pom.xml` file, by specifying only the desired child modules in the command, but **without the leading period "." in the comma-separated list of projects, the parent `poml.xml` file itself might not get installed.** Please refer to the comments inside the `pom.xml` file for further details.
137+
inside the directory containing the parent `pom.xml` file, by specifying only the desired child modules in the command, but **without the leading period "." in the comma-separated list of projects, the parent `poml.xml` file itself might not get installed.** Please refer to the comments inside the `pom.xml` file for further details. From the "platform" subdirectory, we can also install the "platform" artifacts with a similar command:
138+
139+
```bash
140+
$ cd platform
141+
$ mvn install --projects ../opencv/platform,../ffmpeg/platform,etc. -Djavacpp.platform.host
142+
```
138143

139144

140145
### The `cppbuild.sh` scripts

ci/install-travis.sh

+12-8
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@ touch $HOME/vars.list
1313
if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
1414

1515
if [[ "$OS" == "linux-x86" ]] || [[ "$OS" == "linux-x86_64" ]] || [[ "$OS" =~ android ]]; then
16+
CENTOS_VERSION=6
17+
if [[ "libfreenect2 librealsense chilitags llvm mxnet tensorflow skia " =~ "$PROJ " ]] || [[ "$OS" =~ android ]]; then
18+
CENTOS_VERSION=7
19+
fi
1620
echo "Starting docker for x86_64 and x86 linux"
17-
docker run -d -ti -e CI_DEPLOY_USERNAME -e CI_DEPLOY_PASSWORD -e "container=docker" -v $HOME:$HOME -v $TRAVIS_BUILD_DIR/../:$HOME/build -v /sys/fs/cgroup:/sys/fs/cgroup nvidia/cuda:8.0-cudnn6-devel-centos7 /usr/sbin/init > /dev/null
21+
docker run -d -ti -e CI_DEPLOY_USERNAME -e CI_DEPLOY_PASSWORD -e "container=docker" -v $HOME:$HOME -v $TRAVIS_BUILD_DIR/../:$HOME/build -v /sys/fs/cgroup:/sys/fs/cgroup nvidia/cuda:8.0-cudnn6-devel-centos$CENTOS_VERSION /bin/bash > /dev/null
1822
DOCKER_CONTAINER_ID=$(docker ps | grep centos | awk '{print $1}')
1923
echo "Container id is $DOCKER_CONTAINER_ID please wait while updates applied"
20-
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "yum -y install epel-release" > /dev/null
21-
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "yum -y install clang gcc-c++ gcc-gfortran java-devel maven python numpy swig git file which wget unzip tar bzip2 gzip xz patch make cmake3 libtool perl nasm yasm alsa-lib-devel freeglut-devel glfw-devel gtk2-devel libusb-devel libusb1-devel zlib-devel SDL-devel" > /dev/null
24+
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "yum -y install centos-release-scl-rh epel-release" > /dev/null
25+
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "yum -y install devtoolset-3-toolchain maven30 clang gcc-c++ gcc-gfortran java-devel maven python numpy swig git file which wget unzip tar bzip2 gzip xz patch make cmake3 libtool perl nasm yasm alsa-lib-devel freeglut-devel glfw-devel gtk2-devel libusb-devel libusb1-devel zlib-devel SDL-devel" > /dev/null
2226
if [ "$OS" == "linux-x86" ]; then
2327
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "rpm -qa | sed s/.x86_64$/.i686/ | xargs yum -y install > /dev/null"
2428
fi
@@ -247,20 +251,20 @@ if [[ "$OS" == "linux-x86" ]] || [[ "$OS" == "linux-x86_64" ]] || [[ "$OS" =~ a
247251
while true; do echo .; docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "tail -10 $HOME/build/javacpp-presets/buildlogs/$PROJ.log"; sleep 300; done &
248252
if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
249253
echo "Not a pull request so attempting to deploy using docker"
250-
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec ". $HOME/vars.list; cd $HOME/build/javacpp-presets;mvn deploy -U -Djavacpp.copyResources --settings ./ci/settings.xml -Dmaven.test.skip=true -Dmaven.javadoc.skip=true \$BUILD_COMPILER \$BUILD_ROOT -Djavacpp.platform=$OS -l $HOME/build/javacpp-presets/buildlogs/$PROJ.log -pl .,$PROJ"; export BUILD_STATUS=$?
254+
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec ". $HOME/vars.list; cd $HOME/build/javacpp-presets; /opt/rh/maven30/root/usr/bin/mvn deploy -U -Djavacpp.copyResources --settings ./ci/settings.xml -Dmaven.test.skip=true -Dmaven.javadoc.skip=true \$BUILD_COMPILER \$BUILD_ROOT -Djavacpp.platform=$OS -l $HOME/build/javacpp-presets/buildlogs/$PROJ.log -pl .,$PROJ"; export BUILD_STATUS=$?
251255
else
252256
echo "Pull request so install using docker"
253-
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec ". $HOME/vars.list; cd $HOME/build/javacpp-presets;mvn install -U --settings ./ci/settings.xml -Djavacpp.copyResources -Dmaven.test.skip=true \$BUILD_COMPILER \$BUILD_ROOT -Dmaven.javadoc.skip=true -Djavacpp.platform=$OS -l $HOME/build/javacpp-presets/buildlogs/$PROJ.log -pl .,$PROJ"; export BUILD_STATUS=$?
257+
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec ". $HOME/vars.list; cd $HOME/build/javacpp-presets; /opt/rh/maven30/root/usr/bin/mvn install -U --settings ./ci/settings.xml -Djavacpp.copyResources -Dmaven.test.skip=true \$BUILD_COMPILER \$BUILD_ROOT -Dmaven.javadoc.skip=true -Djavacpp.platform=$OS -l $HOME/build/javacpp-presets/buildlogs/$PROJ.log -pl .,$PROJ"; export BUILD_STATUS=$?
254258
fi
255259
else
256260
if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
257261
echo "Not a pull request so attempting to deploy using docker"
258-
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec ". $HOME/vars.list; cd $HOME/build/javacpp-presets;mvn deploy -U -Djavacpp.copyResources --settings ./ci/settings.xml -Dmaven.test.skip=true -Dmaven.javadoc.skip=true \$BUILD_COMPILER \$BUILD_ROOT -Djavacpp.platform=$OS -pl .,$PROJ"; export BUILD_STATUS=$?
262+
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec ". $HOME/vars.list; cd $HOME/build/javacpp-presets; /opt/rh/maven30/root/usr/bin/mvn deploy -U -Djavacpp.copyResources --settings ./ci/settings.xml -Dmaven.test.skip=true -Dmaven.javadoc.skip=true \$BUILD_COMPILER \$BUILD_ROOT -Djavacpp.platform=$OS -pl .,$PROJ"; export BUILD_STATUS=$?
259263
if [ $BUILD_STATUS -eq 0 ]; then
260264
echo "Deploying platform"
261265
for i in ${PROJ//,/ }
262266
do
263-
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "cd $HOME/build/javacpp-presets/$i; mvn -U -f platform/pom.xml -Djavacpp.platform=$OS --settings ../ci/settings.xml deploy"; export BUILD_STATUS=$?
267+
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "cd $HOME/build/javacpp-presets/$i; /opt/rh/maven30/root/usr/bin/mvn -U -f platform/pom.xml -Djavacpp.platform=$OS --settings ../ci/settings.xml deploy"; export BUILD_STATUS=$?
264268
if [ $BUILD_STATUS -ne 0 ]; then
265269
echo "Build Failed"
266270
exit $BUILD_STATUS
@@ -270,7 +274,7 @@ if [[ "$OS" == "linux-x86" ]] || [[ "$OS" == "linux-x86_64" ]] || [[ "$OS" =~ a
270274

271275
else
272276
echo "Pull request so install using docker"
273-
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec ". $HOME/vars.list; cd $HOME/build/javacpp-presets;mvn install -U --settings ./ci/settings.xml -Djavacpp.copyResources -Dmaven.test.skip=true -Dmaven.javadoc.skip=true \$BUILD_COMPILER \$BUILD_ROOT -Djavacpp.platform=$OS -pl .,$PROJ"; export BUILD_STATUS=$?
277+
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec ". $HOME/vars.list; cd $HOME/build/javacpp-presets; /opt/rh/maven30/root/usr/bin/mvn install -U --settings ./ci/settings.xml -Djavacpp.copyResources -Dmaven.test.skip=true -Dmaven.javadoc.skip=true \$BUILD_COMPILER \$BUILD_ROOT -Djavacpp.platform=$OS -pl .,$PROJ"; export BUILD_STATUS=$?
274278
fi
275279
fi
276280
echo "Build status $BUILD_STATUS"

0 commit comments

Comments
 (0)