summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2017-12-20 14:57:13 -0500
committerJoe George <joe@zeroc.com>2017-12-20 14:57:13 -0500
commit686decaa4ef3fbcc009f8a06886ea30652f49605 (patch)
tree8e940c7b46ab25698d492dfc7e949775ffae5249
parentUpdate docker run command on Travis CI (diff)
downloadice-686decaa4ef3fbcc009f8a06886ea30652f49605.tar.bz2
ice-686decaa4ef3fbcc009f8a06886ea30652f49605.tar.xz
ice-686decaa4ef3fbcc009f8a06886ea30652f49605.zip
Travis file updates
-rw-r--r--.travis.yml19
1 files changed, 10 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 08df6f54bc3..b3c6f67e5b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,8 @@ env:
- DOCKER_BASE_IMAGE=zerocci/ice-base:${DOCKER_BASE_TAG}
- DOCKER_BUILD_IMAGE=zerocci/ice-travis-build:${TRAVIS_BUILD_NUMBER}
- MAKEFLAGS="-j3 V=1 OPTIMIZE=no USER_NAMESPACES=no CONFIGS=shared"
- - DOCKER_RUN="docker run -it --rm ${DOCKER_BUILD_IMAGE} /bin/bash -c"
+ # see https://github.com/travis-ci/travis-ci/issues/8920#issuecomment-353133953 for fcntl issue
+ - DOCKER_RUN="python -c 'import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)';docker run -it --rm ${DOCKER_BUILD_IMAGE} /bin/bash -c"
- ALLTESTS="python allTests.py --protocol=ssl --workers=4"
jobs:
@@ -25,21 +26,21 @@ jobs:
- stage: test docker image
script: $DOCKER_RUN "${ALLTESTS} --filter=cpp"
- env: TESTING=C++
+ env: comment=C++
- script: $DOCKER_RUN "cd cpp; make ${MAKEFLAGS} CONFIGS='shared cpp11-shared'; ${ALLTESTS}"
- env: TESTING=C++11
+ env: comment=C++11
- script: $DOCKER_RUN "${ALLTESTS} --filter=java"
- env: TESTING=Java
+ env: comment=Java
- script: $DOCKER_RUN "${ALLTESTS} --filter=java-compat"
- env: TESTING=Java Compat
+ env: comment=Java Compat
- script: $DOCKER_RUN "${ALLTESTS} --filter=js"
- env: TESTING=JavaScript
+ env: comment=JavaScript
- script: $DOCKER_RUN "${ALLTESTS} --filter=php"
- env: TESTING=PHP
+ env: comment=PHP
- script: $DOCKER_RUN "${ALLTESTS} --filter=python"
- env: TESTING=Python
+ env: comment=Python
- script: $DOCKER_RUN "${ALLTESTS} --filter=ruby"
- env: TESTING=Ruby
+ env: comment=Ruby
notifications:
email: travis-ci@zeroc.com