File tree 4 files changed +18
-30
lines changed
4 files changed +18
-30
lines changed Original file line number Diff line number Diff line change 7
7
#
8
8
version : 1.0.{build}-{branch}
9
9
10
- # Current Boost.GIL develop branch (future Boost 1.68) requires C++11
10
+ # Current Boost.GIL develop branch requires C++14
11
11
# Since VS2017, MSVC default is /std:c++14, so no explicit switch is required.
12
12
image : Visual Studio 2017
13
13
@@ -17,18 +17,6 @@ shallow_clone: true
17
17
18
18
environment :
19
19
matrix :
20
- - TOOLSET : msvc-14.0
21
- ARCH : x86_64
22
- VARIANT : debug
23
- CXXSTD : 11
24
- TEST_HEADERS : 1
25
- APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
26
- - TOOLSET : msvc-14.0
27
- ARCH : x86_64
28
- VARIANT : release
29
- CXXSTD : 11
30
- TEST_HEADERS : 1
31
- APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
32
20
- TOOLSET : msvc-14.1
33
21
ARCH : x86_64
34
22
VARIANT : debug
Original file line number Diff line number Diff line change 7
7
parameters :
8
8
# defaults, if not specified
9
9
configuration : ' Release'
10
- cxxver : ' 11 '
10
+ cxxver : ' 14 '
11
11
enable_ext_io : ' OFF'
12
12
enable_ext_numeric : ' ON'
13
13
enable_ext_toolbox : ' ON'
Original file line number Diff line number Diff line change @@ -19,64 +19,64 @@ jobs:
19
19
matrix :
20
20
include :
21
21
- toolset : gcc-6
22
- cxxstd : " 11, 14,1z"
22
+ cxxstd : " 14,1z"
23
23
os : ubuntu-18.04
24
24
install : g++-6
25
25
- toolset : gcc-7
26
- cxxstd : " 11, 14,17"
26
+ cxxstd : " 14,17"
27
27
os : ubuntu-18.04
28
28
- toolset : gcc
29
29
compiler : g++-8
30
- cxxstd : " 11, 14"
30
+ cxxstd : " 14"
31
31
os : ubuntu-18.04
32
32
install : g++-8
33
33
- toolset : gcc-9
34
- cxxstd : " 11, 14,17"
34
+ cxxstd : " 14,17"
35
35
os : ubuntu-18.04
36
36
- toolset : gcc-10
37
- cxxstd : " 11, 14,17"
37
+ cxxstd : " 14,17"
38
38
os : ubuntu-18.04
39
39
- toolset : clang
40
40
compiler : clang++-3.9
41
- cxxstd : " 11, 14"
41
+ cxxstd : " 14"
42
42
os : ubuntu-18.04
43
43
install : clang-3.9
44
44
- toolset : clang
45
45
compiler : clang++-4.0
46
- cxxstd : " 11, 14"
46
+ cxxstd : " 14"
47
47
os : ubuntu-18.04
48
48
install : clang-4.0
49
49
- toolset : clang
50
50
compiler : clang++-5.0
51
- cxxstd : " 11, 14,1z"
51
+ cxxstd : " 14,1z"
52
52
os : ubuntu-18.04
53
53
install : clang-5.0
54
54
- toolset : clang
55
55
compiler : clang++-6.0
56
- cxxstd : " 11, 14,17"
56
+ cxxstd : " 14,17"
57
57
os : ubuntu-18.04
58
58
install : clang-6.0
59
59
- toolset : clang
60
60
compiler : clang++-7
61
- cxxstd : " 11, 14,17"
61
+ cxxstd : " 14,17"
62
62
os : ubuntu-18.04
63
63
install : clang-7
64
64
- toolset : clang
65
65
compiler : clang++-8
66
- cxxstd : " 11, 14,17"
66
+ cxxstd : " 14,17"
67
67
os : ubuntu-20.04
68
68
install : clang-8
69
69
- toolset : clang
70
70
compiler : clang++-9
71
- cxxstd : " 11, 14,17"
71
+ cxxstd : " 14,17"
72
72
os : ubuntu-20.04
73
73
install : clang-9
74
74
- toolset : clang
75
75
compiler : clang++-10
76
- cxxstd : " 11, 14,17"
76
+ cxxstd : " 14,17"
77
77
os : ubuntu-20.04
78
78
- toolset : clang
79
- cxxstd : " 11, 14,17"
79
+ cxxstd : " 14,17"
80
80
os : macos-10.15
81
81
82
82
runs-on : ${{matrix.os}}
@@ -129,7 +129,7 @@ jobs:
129
129
addrmd : 32,64
130
130
os : windows-2019
131
131
- toolset : gcc
132
- cxxstd : " 11, 14,17"
132
+ cxxstd : " 14,17"
133
133
addrmd : 64
134
134
os : windows-2019
135
135
- toolset : msvc-14.3
Original file line number Diff line number Diff line change 43
43
- name : Run tests
44
44
run : |
45
45
cd ../boost-root
46
- ./b2 -j3 libs/$LIBRARY/test coverage=on toolset=gcc cxxstd=11 variant=debug
46
+ ./b2 -j3 libs/$LIBRARY/test coverage=on toolset=gcc cxxstd=14 variant=debug
47
47
lcov --directory bin.v2 --capture --no-external --directory $(pwd) --output-file coverage.info > /dev/null 2>&1
48
48
lcov --extract coverage.info $(pwd)'/boost/gil/*' --output-file coverage.info > /dev/null
49
49
lcov --list coverage.info
You can’t perform that action at this time.
0 commit comments