Skip to content

Commit a09ad81

Browse files
committed
ci: Remove C++11 build jobs after C++14 switch
Closes boostorg#696
1 parent 95679b6 commit a09ad81

File tree

4 files changed

+18
-30
lines changed

4 files changed

+18
-30
lines changed

.appveyor.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
version: 1.0.{build}-{branch}
99

10-
# Current Boost.GIL develop branch (future Boost 1.68) requires C++11
10+
# Current Boost.GIL develop branch requires C++14
1111
# Since VS2017, MSVC default is /std:c++14, so no explicit switch is required.
1212
image: Visual Studio 2017
1313

@@ -17,18 +17,6 @@ shallow_clone: true
1717

1818
environment:
1919
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
3220
- TOOLSET: msvc-14.1
3321
ARCH: x86_64
3422
VARIANT: debug

.ci/azure-pipelines/steps-cmake-build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
parameters:
88
# defaults, if not specified
99
configuration: 'Release'
10-
cxxver: '11'
10+
cxxver: '14'
1111
enable_ext_io: 'OFF'
1212
enable_ext_numeric: 'ON'
1313
enable_ext_toolbox: 'ON'

.github/workflows/ci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,64 +19,64 @@ jobs:
1919
matrix:
2020
include:
2121
- toolset: gcc-6
22-
cxxstd: "11,14,1z"
22+
cxxstd: "14,1z"
2323
os: ubuntu-18.04
2424
install: g++-6
2525
- toolset: gcc-7
26-
cxxstd: "11,14,17"
26+
cxxstd: "14,17"
2727
os: ubuntu-18.04
2828
- toolset: gcc
2929
compiler: g++-8
30-
cxxstd: "11,14"
30+
cxxstd: "14"
3131
os: ubuntu-18.04
3232
install: g++-8
3333
- toolset: gcc-9
34-
cxxstd: "11,14,17"
34+
cxxstd: "14,17"
3535
os: ubuntu-18.04
3636
- toolset: gcc-10
37-
cxxstd: "11,14,17"
37+
cxxstd: "14,17"
3838
os: ubuntu-18.04
3939
- toolset: clang
4040
compiler: clang++-3.9
41-
cxxstd: "11,14"
41+
cxxstd: "14"
4242
os: ubuntu-18.04
4343
install: clang-3.9
4444
- toolset: clang
4545
compiler: clang++-4.0
46-
cxxstd: "11,14"
46+
cxxstd: "14"
4747
os: ubuntu-18.04
4848
install: clang-4.0
4949
- toolset: clang
5050
compiler: clang++-5.0
51-
cxxstd: "11,14,1z"
51+
cxxstd: "14,1z"
5252
os: ubuntu-18.04
5353
install: clang-5.0
5454
- toolset: clang
5555
compiler: clang++-6.0
56-
cxxstd: "11,14,17"
56+
cxxstd: "14,17"
5757
os: ubuntu-18.04
5858
install: clang-6.0
5959
- toolset: clang
6060
compiler: clang++-7
61-
cxxstd: "11,14,17"
61+
cxxstd: "14,17"
6262
os: ubuntu-18.04
6363
install: clang-7
6464
- toolset: clang
6565
compiler: clang++-8
66-
cxxstd: "11,14,17"
66+
cxxstd: "14,17"
6767
os: ubuntu-20.04
6868
install: clang-8
6969
- toolset: clang
7070
compiler: clang++-9
71-
cxxstd: "11,14,17"
71+
cxxstd: "14,17"
7272
os: ubuntu-20.04
7373
install: clang-9
7474
- toolset: clang
7575
compiler: clang++-10
76-
cxxstd: "11,14,17"
76+
cxxstd: "14,17"
7777
os: ubuntu-20.04
7878
- toolset: clang
79-
cxxstd: "11,14,17"
79+
cxxstd: "14,17"
8080
os: macos-10.15
8181

8282
runs-on: ${{matrix.os}}
@@ -129,7 +129,7 @@ jobs:
129129
addrmd: 32,64
130130
os: windows-2019
131131
- toolset: gcc
132-
cxxstd: "11,14,17"
132+
cxxstd: "14,17"
133133
addrmd: 64
134134
os: windows-2019
135135
- toolset: msvc-14.3

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Run tests
4444
run: |
4545
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
4747
lcov --directory bin.v2 --capture --no-external --directory $(pwd) --output-file coverage.info > /dev/null 2>&1
4848
lcov --extract coverage.info $(pwd)'/boost/gil/*' --output-file coverage.info > /dev/null
4949
lcov --list coverage.info

0 commit comments

Comments
 (0)