diff options
| author | Martin Hořeňovský | 2019-12-15 20:36:35 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-12-16 00:15:10 +0100 |
| commit | 69bd213c40939f0611d073b0a239c659be1f2613 (patch) | |
| tree | 8f83bc6fbc168ecd1db493b097262ab320b2653d | |
| parent | 5fbf04cd59ab2e082411ac2fb1aeb4fc97451ef4 (diff) | |
| download | catch3-69bd213c40939f0611d073b0a239c659be1f2613.tar.gz | |
Reenable travis for CI
| -rw-r--r-- | .travis.yml | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 18766e52..ad56de39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -158,24 +158,22 @@ matrix: - # Special builds, e.g. conan - - language: python - python: - - "3.7" - install: - - pip install conan-package-tools - env: - - CONAN_GCC_VERSIONS=8 - - CONAN_DOCKER_IMAGE=conanio/gcc8 - - CPP14=1 - script: - - python .conan/build.py +# # Special builds, e.g. conan +# - language: python +# python: +# - "3.7" +# install: +# - pip install conan-package-tools +# env: +# - CONAN_GCC_VERSIONS=8 +# - CONAN_DOCKER_IMAGE=conanio/gcc8 +# - CPP14=1 +# script: +# - python .conan/build.py before_script: - export CXX=${COMPILER} - cd ${TRAVIS_BUILD_DIR} - # Regenerate single header file, so it is tested in the examples... - - python tools/scripts/generateSingleHeader.py - | if [[ ${CPP17} -eq 1 ]]; then |