final commit (hopefully ;-)

rttrorg · Feb 4, 2018 · 40b2428 · 40b2428
1 parent 253cd53
commit 40b2428
Showing 1 changed file with 22 additions and 47 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -39,32 +39,7 @@ env:
 
 matrix:
   include:
-    # OSX/Clang
-    - os: osx
-      osx_image: xcode9.2
-      compiler: clang
-      env: COMPILER=clang++ ARCH=x86 CONF=Release UNIT_TESTS=true BUILD_BENCHMARKS=true
-
-    - os: osx
-      osx_image: xcode9.2
-      compiler: clang
-      env: COMPILER=clang++ ARCH=x86_64 CONF=Release UNIT_TESTS=true
-
-    - os: osx
-      osx_image: xcode9
-      compiler: clang
-      env: COMPILER=clang++ ARCH=x86_64 CONF=Release UNIT_TESTS=true
-
-    - os: osx
-      osx_image: xcode8.3
-      compiler: clang
-      env: COMPILER=clang++ ARCH=x86 CONF=Release UNIT_TESTS=true
-
-    - os: osx
-      osx_image: xcode8.3
-      compiler: clang
-      env: COMPILER=clang++ ARCH=x86_64 CONF=Release UNIT_TESTS=true
-
+
      # check code formatting
     - os: linux
       compiler: gcc
@@ -219,31 +194,31 @@ matrix:
           packages: ['libstdc++-7-dev', 'clang-5.0',]
       env: COMPILER=clang++-5.0 ARCH=x86_64 CONF=Release UNIT_TESTS=true
 
-    # # OSX/Clang
-    # - os: osx
-    #   osx_image: xcode9.2
-    #   compiler: clang
-    #   env: COMPILER=clang++ ARCH=x86 CONF=Release UNIT_TESTS=true BUILD_BENCHMARKS=true
+    # OSX/Clang
+    - os: osx
+      osx_image: xcode9.2
+      compiler: clang
+      env: COMPILER=clang++ ARCH=x86 CONF=Release UNIT_TESTS=true BUILD_BENCHMARKS=true
 
-    # - os: osx
-    #   osx_image: xcode9.2
-    #   compiler: clang
-    #   env: COMPILER=clang++ ARCH=x86_64 CONF=Release UNIT_TESTS=true
+    - os: osx
+      osx_image: xcode9.2
+      compiler: clang
+      env: COMPILER=clang++ ARCH=x86_64 CONF=Release UNIT_TESTS=true
 
-    # - os: osx
-    #   osx_image: xcode9
-    #   compiler: clang
-    #   env: COMPILER=clang++ ARCH=x86_64 CONF=Release UNIT_TESTS=true
+    - os: osx
+      osx_image: xcode9
+      compiler: clang
+      env: COMPILER=clang++ ARCH=x86_64 CONF=Release UNIT_TESTS=true
 
-    # - os: osx
-    #   osx_image: xcode8.3
-    #   compiler: clang
-    #   env: COMPILER=clang++ ARCH=x86 CONF=Release UNIT_TESTS=true
+    - os: osx
+      osx_image: xcode8.3
+      compiler: clang
+      env: COMPILER=clang++ ARCH=x86 CONF=Release UNIT_TESTS=true
 
-    # - os: osx
-    #   osx_image: xcode8.3
-    #   compiler: clang
-    #   env: COMPILER=clang++ ARCH=x86_64 CONF=Release UNIT_TESTS=true
+    - os: osx
+      osx_image: xcode8.3
+      compiler: clang
+      env: COMPILER=clang++ ARCH=x86_64 CONF=Release UNIT_TESTS=true
 
 before_install:
   - export CIT_ROOT=`pwd`