Skip to content

Commit a196543

Browse files
committed
wip
1 parent f2e7931 commit a196543

File tree

1 file changed

+18
-20
lines changed

1 file changed

+18
-20
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ jobs:
4848
include:
4949
# Linux, gcc
5050
- { compiler: gcc-10, cxxstd: '20', os: ubuntu-22.04 }
51-
- { compiler: gcc-11, cxxstd: '20', os: ubuntu-22.04 }
51+
- { compiler: gcc- cxxstd: '20', os: ubuntu-22.04 }
5252
- { compiler: gcc-12, cxxstd: '20', os: ubuntu-22.04 }
53-
- { compiler: gcc-13, cxxstd: '11,14,17,20,2b', os: ubuntu-24.04 }
54-
- { compiler: gcc-14, cxxstd: '11,14,17,20,2b', os: ubuntu-24.04 }
53+
- { compiler: gcc-13, cxxstd: '17,20,2b', os: ubuntu-24.04 }
54+
- { compiler: gcc- cxxstd: '17,20,2b', os: ubuntu-24.04 }
5555

5656
- { name: GCC w/ sanitizers, sanitize: yes,
5757
compiler: gcc-13, cxxstd: '20', os: ubuntu-24.04 }
@@ -60,26 +60,25 @@ jobs:
6060

6161
# Linux, clang
6262
- { compiler: clang-10, cxxstd: '20', os: ubuntu-latest, container: 'ubuntu:20.04' }
63-
- { compiler: clang-11, cxxstd: '20', os: ubuntu-latest, container: 'ubuntu:20.04' }
63+
- { compiler: clang- cxxstd: '20', os: ubuntu-latest, container: 'ubuntu:20.04' }
6464
- { compiler: clang-12, cxxstd: '20', os: ubuntu-latest, container: 'ubuntu:20.04' }
6565
- { compiler: clang-13, cxxstd: '20', os: ubuntu-latest, container: 'ubuntu:22.04' }
66-
- { compiler: clang-14, cxxstd: '20', os: ubuntu-latest, container: 'ubuntu:22.04' }
66+
- { compiler: clang- cxxstd: '20', os: ubuntu-latest, container: 'ubuntu:22.04' }
6767
- { compiler: clang-15, cxxstd: '20', os: ubuntu-latest, container: 'ubuntu:22.04' }
68-
- { compiler: clang-16, cxxstd: '11,14,17,20,2b', os: ubuntu-24.04 }
69-
- { compiler: clang-17, cxxstd: '11,14,17,20,23', os: ubuntu-latest, container: 'ubuntu:24.04' }
70-
- { compiler: clang-18, cxxstd: '11,14,17,20,23,2c', os: ubuntu-24.04 }
68+
- { compiler: clang-16, cxxstd: '17,20,2b', os: ubuntu-24.04 }
69+
- { compiler: clang-17, cxxstd: '17,20,23', os: ubuntu-latest, container: 'ubuntu:24.04' }
70+
- { compiler: clang-18, cxxstd: '17,20,23,2c', os: ubuntu-24.04 }
7171

7272
# libc++
73-
- { compiler: clang-6.0, cxxstd: '11,14', os: ubuntu-latest, container: 'ubuntu:18.04', stdlib: libc++, install: 'clang-6.0 libc++-dev libc++abi-dev' }
74-
- { compiler: clang-7, cxxstd: '11,14,17', os: ubuntu-latest, container: 'ubuntu:20.04', stdlib: libc++ }
73+
- { compiler: clang-7, cxxstd: '17', os: ubuntu-latest, container: 'ubuntu:20.04', stdlib: libc++ }
7574
- { name: Clang w/ sanitizers, sanitize: yes,
7675
compiler: clang-12, cxxstd: '20', os: ubuntu-latest, container: 'ubuntu:20.04', stdlib: libc++ }
7776

7877
# OSX, clang
7978
- { name: MacOS w/ clang and sanitizers,
80-
compiler: clang, cxxstd: '11,14,17,20,2b', os: macos-13, sanitize: yes }
81-
- { compiler: clang, cxxstd: '11,14,17,20,2b', os: macos-14 }
82-
- { compiler: clang, cxxstd: '11,14,17,20,2b', os: macos-15 }
79+
compiler: clang, cxxstd: '17,20,2b', os: macos-13, sanitize: yes }
80+
- { compiler: clang, cxxstd: '17,20,2b', os: macos-14 }
81+
- { compiler: clang, cxxstd: '17,20,2b', os: macos-15 }
8382

8483
# Coverity Scan
8584
# requires two github secrets in repo to activate; see ci/github/coverity.sh
@@ -270,13 +269,12 @@ jobs:
270269
fail-fast: false
271270
matrix:
272271
include:
273-
- { toolset: msvc-14.0, cxxstd: '14,latest', addrmd: '32,64', os: windows-2019 }
274-
- { toolset: msvc-14.2, cxxstd: '14,17,20', addrmd: '32,64', os: windows-2019 }
275-
- { toolset: msvc-14.3, cxxstd: '14,17,20,latest',addrmd: '32,64', os: windows-2022 }
272+
- { toolset: msvc-14.2, cxxstd: '17,20', addrmd: '32,64', os: windows-2019 }
273+
- { toolset: msvc-14.3, cxxstd: '17,20,latest',addrmd: '32,64', os: windows-2022 }
276274
- { name: Collect coverage, coverage: yes,
277275
toolset: msvc-14.3, cxxstd: 'latest', addrmd: '64', os: windows-2022 }
278-
- { toolset: clang-win, cxxstd: '14,17,latest', addrmd: '32,64', os: windows-2022 }
279-
- { toolset: gcc, cxxstd: '11,14,17,2a', addrmd: '64', os: windows-2019 }
276+
- { toolset: clang-win, cxxstd: '17,latest', addrmd: '32,64', os: windows-2022 }
277+
- { toolset: gcc, cxxstd: '17,2a', addrmd: '64', os: windows-2019 }
280278

281279
runs-on: ${{matrix.os}}
282280

@@ -339,8 +337,8 @@ jobs:
339337
fail-fast: false
340338
matrix:
341339
include:
342-
- { sys: MINGW32, compiler: gcc, cxxstd: '11,17,20' }
343-
- { sys: MINGW64, compiler: gcc, cxxstd: '11,17,20' }
340+
- { sys: MINGW32, compiler: gcc, cxxstd: '17,20' }
341+
- { sys: MINGW64, compiler: gcc, cxxstd: '17,20' }
344342

345343
runs-on: windows-latest
346344

0 commit comments

Comments
 (0)