CI updates.

This updates to use Circle CI by default, but we leave Travis in place
(but only one default build and one coverage build) until we can move it.
We also switch to using ninja for performance reasons.

The hope is to get to using CircleCI for everything except Windows.  The
AppVeyor build needs cleanups and should switch to ninja later.

3 files changed, 14 insertions, 60 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index 03dcae69..848fe9c3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,12 +26,12 @@ environment:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       GENERATOR: Visual Studio 15 2017
       CFG: Debug
-      VSINSTALL: '"Microsoft Visual Studio"/2017/Community/VC/Auxiliary/Build'      
+      VSINSTALL: '"Microsoft Visual Studio"/2017/Community/VC/Auxiliary/Build'
       MSVC_PLATFORM: x86
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       GENERATOR: Visual Studio 15 2017 Win64
       CFG: Debug
-      VSINSTALL: '"Microsoft Visual Studio"/2017/Community/VC/Auxiliary/Build'      
+      VSINSTALL: '"Microsoft Visual Studio"/2017/Community/VC/Auxiliary/Build'
       MSVC_PLATFORM: amd64
 
 
diff --git a/.travis.yml b/.travis.yml
index 3fa094f9..aa5c4ea9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ language: generic
 sudo: false
 matrix:
   include:
-    # stock build (4.8 probably) - we also do a clang-format check here.
+    # clang 4.0 -  we also do a clang-format check here.
     - os: linux
       dist: trusty
       addons:
@@ -19,55 +19,11 @@ matrix:
             - llvm-toolchain-trusty-4.0
           packages:
             - colordiff
+            - clang-4.0
             - clang-format-4.0
-      env: CLANG_FORMAT=clang-format-4.0
+            - ninja-build
+      env: CC=clang-4.0 CLANG_FORMAT=clang-format-4.0
   
-    # default gcc 4.9 build - we also do a clang-format check here.
-    - os: linux
-      dist: trusty
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
-          packages:
-            - colordiff
-            - gcc-4.9
-            - clang-format-4.0
-      env: CC=gcc-4.9
-
-    # gcc 7 (latest version) build
-    - os: linux
-      dist: trusty
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - gcc-7
-      env: CC=gcc-7
-    # clang v4 build
-    - os: linux
-      dist: trusty
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-trusty-4.0
-          packages:
-            - clang-4.0
-      env: CC=clang-4.0
-
-    # release build using clang 4
-    - os: linux
-      dist: trusty
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-trusty-4.0
-          packages:
-            - clang-4.0
-      env: CC=clang-4.0 BUILD_TYPE=Release
-
     # code coverage build
     - os: linux
       dist: trusty
@@ -78,25 +34,24 @@ matrix:
           packages:
             - gcc-7
             - g++-7
+            - ninja-build
       env: CC=gcc-7 CXX=g++-7 COVERAGE=ON GCOV=gcov-7
 
-    # One MacOS X build
-    - os: osx
-      env: CC=clang
+    # mac OS is currently unusable at Travis, so disabled.
+    # - os: osx
+    #   env: CC=clang
 
 before_script:
   - uname -a
-  - printenv
   - cmake --version
 
 script:
   # Perform out-of-source build
   - mkdir build
   - cd build
-  # Perform CMake backend generation, build, and test
-  - cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DNNG_ENABLE_COVERAGE=${COVERAGE:-OFF} ..
-  - cmake --build . -- -j4
-  - ctest --output-on-failure -C ${BUILD_TYPE:-Debug}
+  - cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DNNG_ENABLE_COVERAGE=${COVERAGE:-OFF} ..
+  - ninja
+  - ninja test
   - env CLANG_FORMAT=${CLANG_FORMAT:-no} ../etc/format-check.sh
 
 after_success:
diff --git a/README.adoc b/README.adoc
index 465f115a..29c8e1c2 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,8 +1,7 @@
 = nng - nanomsg-next-gen
 
 image:https://img.shields.io/badge/license-MIT-blue.svg[MIT License]
-https:https://img.shields.io/circleci/project/github/nanomsg/nng.svg?label=[Linux Status,link="https://circleci.com/gh/nanomsg/nng"]
-image:https://img.shields.io/travis/nanomsg/nng/master.svg?label=linux[Linux Status,link="https://travis-ci.org/nanomsg/nng"]
+image:https://img.shields.io/circleci/project/github/nanomsg/nng.svg?label=[Linux Status,link="https://circleci.com/gh/nanomsg/nng"]
 image:https://img.shields.io/appveyor/ci/nanomsg/nng/master.svg?label=windows[Windows Status,link="https://ci.appveyor.com/project/nanomsg/nng"]
 image:https://codecov.io/gh/nanomsg/nng/branch/master/graph/badge.svg?label=coverage[Coverage,link="https://codecov.io/gh/nanomsg/nng"]