Modernize CI scripts

Author: d-frey

.appveyor.yml

@@ -0,0 +1,56 @@
+version: '{branch}-{build}'
+
+branches:
+  only:
+    - master
+
+os:
+- Visual Studio 2015
+
+configuration:
+- Release
+- Debug
+
+environment:
+  matrix:
+    - GENERATOR: Visual Studio 14 2015
+
+    - GENERATOR: Visual Studio 14 2015 Win64
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      GENERATOR: Visual Studio 15 2017
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      GENERATOR: Visual Studio 15 2017 Win64
+
+    - GENERATOR: MinGW Makefiles
+      BINDIR: C:\MinGW\bin
+
+    - GENERATOR: MinGW Makefiles
+      COMPILER: MinGW 5
+      BINDIR: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin
+
+    - GENERATOR: MinGW Makefiles
+      COMPILER: MinGW 6
+      BINDIR: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin
+
+    - GENERATOR: MinGW Makefiles
+      COMPILER: MinGW 6
+      BINDIR: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin
+
+init: []
+
+install: []
+
+before_build:
+- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets")
+- if defined BINDIR (set "PATH=%BINDIR%;%PATH:C:\Program Files\Git\usr\bin;=%")
+- md build
+- cd build
+- cmake -Wno-dev -DPEGTL_BUILD_EXAMPLES=OFF --config "%CONFIGURATION%" -G "%GENERATOR%" ..
+
+build_script:
+- cmake --build . --config "%CONFIGURATION%"
+
+test_script:
+- ctest -C "%CONFIGURATION%" --output-on-failure

.travis.yml

@@ -1,138 +1,139 @@
-language: cpp
+language: generic
+os: linux
+dist: trusty
+
+branches:
+  only:
+    - master
 
 matrix:
   include:
-    - os: linux
+    - dist: precise
       compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.7']
-      env: COMPILER=g++-4.7
+      env: CXX=g++-4.7
 
-    - os: linux
-      compiler: gcc
-      addons:
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8']
-      env: COMPILER=g++-4.8
+    - compiler: gcc
+      env: CXX=g++-4.8
 
-    - os: linux
-      compiler: gcc
+    - compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.9']
-      env: COMPILER=g++-4.9
+      env: CXX=g++-4.9
 
-    - os: linux
-      compiler: gcc
+    - compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-5']
-      env: COMPILER=g++-5
+      env: CXX=g++-5
 
-    - os: linux
-      compiler: gcc
+    - compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-6']
-      env: COMPILER=g++-6
+      env: CXX=g++-6
 
-    - os: linux
-      compiler: clang
-      env: COMPILER=clang++
+    - compiler: gcc
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-7']
+      env: CXX=g++-7
 
-    - os: linux
+    - dist: precise
       compiler: clang
+      env: CXX=clang++
+
+    - compiler: clang
       addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5']
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-3.5']
           packages: ['clang-3.5']
-      env: COMPILER=clang++-3.5
+      env: CXX=clang++-3.5
 
-    - os: linux
-      compiler: clang
+    - compiler: clang
       addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6']
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-3.6']
           packages: ['clang-3.6']
-      env: COMPILER=clang++-3.6
+      env: CXX=clang++-3.6
 
-    - os: linux
+    - dist: precise
       compiler: clang
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7']
           packages: ['clang-3.7']
-      env: COMPILER=clang++-3.7
+      env: CXX=clang++-3.7
 
-    - os: linux
-      compiler: clang
+    - compiler: clang
       addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.8']
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-3.8']
           packages: ['clang-3.8']
-      env: COMPILER=clang++-3.8
+      env: CXX=clang++-3.8
 
-    - os: linux
-      dist: trusty
-      compiler: clang
+    - compiler: clang
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-3.9']
           packages: ['clang-3.9']
       env:
-        - COMPILER=clang++-3.9
+        - CXX=clang++-3.9
 
-    - os: linux
-      dist: trusty
-      compiler: clang
+    - compiler: clang
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0']
           packages: ['clang-4.0']
       env:
-        - COMPILER=clang++-4.0
+        - CXX=clang++-4.0
+
+    - compiler: clang
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
+          packages: ['clang-5.0']
+      env:
+        - CXX=clang++-5.0
 
     - os: osx
       osx_image: xcode6.4
       compiler: clang
       env:
-        - COMPILER=clang++
+        - CXX=clang++
 
     - os: osx
       osx_image: xcode7.3
       compiler: clang
       env:
-        - COMPILER=clang++
+        - CXX=clang++
 
     - os: osx
       osx_image: xcode8.2
       compiler: clang
       env:
-        - COMPILER=clang++
+        - CXX=clang++
 
-    - os: linux
-      compiler: gcc
+    - compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6']
+          packages: ['g++-7']
       env:
-        - COMPILER=g++-6
+        - CXX=g++-7
         - CXXFLAGS="-O0 --coverage"
       before_script:
-        - pip install --user urllib3[secure] cpp-coveralls
-        # Work around https://github.com/eddyxu/cpp-coveralls/issues/108 by manually
-        # installing the pyOpenSSL module and injecting it into urllib3 as per
-        # https://urllib3.readthedocs.io/en/latest/user-guide.html#ssl-py2
-        - sed -i -e '/^import sys$/a import urllib3.contrib.pyopenssl\nurllib3.contrib.pyopenssl.inject_into_urllib3()' $(which coveralls)
+        - pip install --user cpp-coveralls
       after_success:
-        - coveralls --gcov gcov-6 --gcov-options '\-lp' --exclude src
+        - coveralls --gcov gcov-7 --gcov-options '\-lp' --exclude src
 
 script:
-  make CXX=$COMPILER -j3
+  make -j3