summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2018-07-24 10:24:33 -0400
committerJoe George <joe@zeroc.com>2018-07-24 10:24:33 -0400
commit6834cc05186b20f0620040ae05c59f746417232c (patch)
tree74ce972a22d4c634c28aa7259dc61e8d38449988
parentPHP Build updates (diff)
downloadice-6834cc05186b20f0620040ae05c59f746417232c.tar.bz2
ice-6834cc05186b20f0620040ae05c59f746417232c.tar.xz
ice-6834cc05186b20f0620040ae05c59f746417232c.zip
Disable C++11 testing on Travis CI. It's too slow
-rw-r--r--.travis.yml26
1 files changed, 13 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index c14895b5a5d..66ab99b181c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,16 +27,16 @@ jobs:
- docker build --cache-from ${DOCKER_BASE_IMAGE} -t ${DOCKER_BUILD_IMAGE} .
- docker push ${DOCKER_BUILD_IMAGE}
- - stage: Build C++11
- script:
- # see https://github.com/travis-ci/travis-ci/issues/8920
- - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
- - docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_PASSWORD}"
- - |
- echo "FROM ${DOCKER_BUILD_IMAGE}" >> Dockerfile
- echo "RUN make -C cpp ${MAKEFLAGS} CONFIGS='cpp11-shared'" >> Dockerfile
- - docker build --cache-from ${DOCKER_BUILD_IMAGE} -t ${DOCKER_BUILD_CPP11_IMAGE} .
- - docker push ${DOCKER_BUILD_CPP11_IMAGE}
+ # - stage: Build C++11
+ # script:
+ # # see https://github.com/travis-ci/travis-ci/issues/8920
+ # - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
+ # - docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_PASSWORD}"
+ # - |
+ # echo "FROM ${DOCKER_BUILD_IMAGE}" >> Dockerfile
+ # echo "RUN make -C cpp ${MAKEFLAGS} CONFIGS='cpp11-shared'" >> Dockerfile
+ # - docker build --cache-from ${DOCKER_BUILD_IMAGE} -t ${DOCKER_BUILD_CPP11_IMAGE} .
+ # - docker push ${DOCKER_BUILD_CPP11_IMAGE}
- &test-staging
stage: Test
@@ -45,9 +45,9 @@ jobs:
- python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
script: $DOCKER_RUN "${ALLTESTS} --language=cpp"
env: comment=C++
- - <<: *test-staging
- script: $DOCKER_RUN_CPP11 "${ALLTESTS} --language=cpp --config=cpp11-shared"
- env: comment=C++11
+ # - <<: *test-staging
+ # script: $DOCKER_RUN_CPP11 "${ALLTESTS} --language=cpp --config=cpp11-shared"
+ # env: comment=C++11
- <<: *test-staging
script: $DOCKER_RUN "${ALLTESTS} --language=csharp"
env: comment=C#