From 69bd213c40939f0611d073b0a239c659be1f2613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
<martin.horenovsky@gmail.com>
Date: Sun, 15 Dec 2019 20:36:35 +0100
Subject: [PATCH] Reenable travis for CI
---
.travis.yml | 26 ++++++++++++--------------
1 file 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