Skip to content

Commit 408b466

Browse files
committed
Modernize Travis and Appveyor configs
This PR updates the Travis and Appveyor configs to use more recent toolchain versions, allowing for better C++11 compliance.
1 parent 2d211de commit 408b466

File tree

2 files changed

+26
-36
lines changed

2 files changed

+26
-36
lines changed

.travis.yml

+19-31
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Build matrix / environment variables are explained on:
22
# http://about.travis-ci.org/docs/user/build-configuration/
3-
# This file can be validated on:
4-
# http://lint.travis-ci.org/
5-
# See also
6-
# http://stackoverflow.com/questions/22111549/travis-ci-with-clang-3-4-and-c11/30925448#30925448
7-
# to allow C++11, though we are not yet building with -std=c++11
3+
# This file can be validated on: http://www.yamllint.com/
4+
# Or using the Ruby based travel command line tool:
5+
# gem install travis --no-rdoc --no-ri
6+
# travis lint .travis.yml
87
language: cpp
98
sudo: false
109
addons:
@@ -15,34 +14,32 @@ addons:
1514
update: false # do not update homebrew by default
1615
apt:
1716
sources:
18-
#- ubuntu-toolchain-r-test
19-
- llvm-toolchain-precise-3.5
17+
- ubuntu-toolchain-r-test
18+
- llvm-toolchain-xenial-8
2019
packages:
21-
#- gcc-4.9
22-
#- g++-4.9
23-
- clang-3.5
20+
- clang-8
2421
- valgrind
2522
matrix:
2623
allow_failures:
2724
- os: osx
2825
include:
2926
- name: Mac clang meson static release testing
3027
os: osx
31-
osx_image: xcode9.4
28+
osx_image: xcode10.2
3229
compiler: clang
33-
env:
34-
CXX="clang++-3.5"
35-
CC="clang-3.5"
30+
env:
31+
CXX="clang++"
32+
CC="clang"
3633
LIB_TYPE=static
3734
BUILD_TYPE=release
3835
script: ./.travis_scripts/meson_builder.sh
39-
- name: trusty clang meson static release testing
36+
- name: xenial clang meson static release testing
4037
os: linux
41-
dist: trusty
38+
dist: xenial
4239
compiler: clang
43-
env:
44-
CXX="clang++-3.5"
45-
CC="clang-3.5"
40+
env:
41+
CXX="clang++"
42+
CC="clang"
4643
LIB_TYPE=static
4744
BUILD_TYPE=release
4845
# before_install and install steps only needed for linux meson builds
@@ -55,23 +52,14 @@ matrix:
5552
os: linux
5653
dist: xenial
5754
compiler: gcc
58-
env:
55+
env:
5956
CXX=g++
6057
CC=gcc
6158
DO_Coverage=ON
6259
BUILD_TOOL="Unix Makefiles"
63-
BUILD_TYPE=Debug
64-
LIB_TYPE=shared
60+
BUILD_TYPE=Debug
61+
LIB_TYPE=shared
6562
DESTDIR=/tmp/cmake_json_cpp
6663
script: ./.travis_scripts/cmake_builder.sh
67-
# Valgrind has too many false positives from the python wrapping. Need a good suppression file
68-
# - name: xenial gcc cmake coverage
69-
# os: linux
70-
# dist: xenial
71-
# compiler: gcc
72-
# env: DO_MemCheck=ON CXX=/usr/bin/g++ BUILD_TOOL="Unix Makefiles" BUILD_TYPE=Debug LIB_TYPE=shared DESTDIR=/tmp/cmake_json_cpp
73-
# script: ./.travis_scripts/cmake_builder.sh
7464
notifications:
7565
email: false
76-
77-

appveyor.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@ clone_folder: c:\projects\jsoncpp
22

33
environment:
44
matrix:
5-
- CMAKE_GENERATOR: Visual Studio 12 2013
6-
- CMAKE_GENERATOR: Visual Studio 12 2013 Win64
75
- CMAKE_GENERATOR: Visual Studio 14 2015
86
- CMAKE_GENERATOR: Visual Studio 14 2015 Win64
7+
- CMAKE_GENERATOR: Visual Studio 15 2017
8+
- CMAKE_GENERATOR: Visual Studio 15 2017 Win64
99

1010
build_script:
1111
- cmake --version
1212
- cd c:\projects\jsoncpp
1313
- cmake -G "%CMAKE_GENERATOR%" -DCMAKE_INSTALL_PREFIX:PATH=%CD:\=/%/install -DBUILD_SHARED_LIBS:BOOL=ON .
14-
# Use ctest to make a dashboard build ctest -D Experimental(Start|Update|Configure|Build|Test|Coverage|MemCheck|Submit)
15-
#NOTE Testing on window is not yet finished - ctest -C Release -D ExperimentalStart -D ExperimentalConfigure -D ExperimentalBuild -D ExperimentalTest -D ExperimentalSubmit
14+
# Use ctest to make a dashboard build:
15+
# - ctest -D Experimental(Start|Update|Configure|Build|Test|Coverage|MemCheck|Submit)
16+
# NOTE: Testing on window is not yet finished:
17+
# - ctest -C Release -D ExperimentalStart -D ExperimentalConfigure -D ExperimentalBuild -D ExperimentalTest -D ExperimentalSubmit
1618
- ctest -C Release -D ExperimentalStart -D ExperimentalConfigure -D ExperimentalBuild -D ExperimentalSubmit
17-
# Final step is to verify that installation succeeds
19+
# Final step is to verify that installation succeeds
1820
- cmake --build . --config Release --target install
1921

2022
deploy:

0 commit comments

Comments
 (0)