Skip to content

Commit 4a07829

Browse files
committed
GHA: Update OS versions, remove containers where possible and add new compilers
1 parent dda55a1 commit 4a07829

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,26 +54,29 @@ jobs:
5454
- { compiler: gcc-7, cxxstd: '11,14,17', os: ubuntu-20.04 }
5555
- { compiler: gcc-8, cxxstd: '11,14,17,2a', os: ubuntu-20.04 }
5656
- { compiler: gcc-9, cxxstd: '11,14,17,2a', os: ubuntu-20.04 }
57-
- { compiler: gcc-10, cxxstd: '11,14,17,20', os: ubuntu-20.04 }
58-
- { compiler: gcc-11, cxxstd: '11,14,17,20', os: ubuntu-20.04 }
57+
- { compiler: gcc-10, cxxstd: '11,14,17,20', os: ubuntu-22.04 }
58+
- { compiler: gcc-11, cxxstd: '11,14,17,20', os: ubuntu-22.04 }
5959
- { compiler: gcc-12, cxxstd: '11,14,17,20', os: ubuntu-22.04 }
60+
- { compiler: gcc-13, cxxstd: '11,14,17,20,2b', os: ubuntu-24.04 }
61+
- { compiler: gcc-14, cxxstd: '11,14,17,20,2b', os: ubuntu-24.04 }
62+
6063
- { name: GCC w/ sanitizers, sanitize: yes,
61-
compiler: gcc-12, cxxstd: '11,14,17,20', os: ubuntu-22.04 }
64+
compiler: gcc-13, cxxstd: '11,14,17,20', os: ubuntu-24.04 }
6265
- { name: Collect coverage, coverage: yes,
6366
compiler: gcc-8, cxxstd: '11,14,17,2a', os: ubuntu-20.04, install: 'g++-8-multilib', address-model: '32,64' }
6467

6568
# Linux, clang
66-
- { compiler: clang-3.5, cxxstd: '03,11', os: ubuntu-latest, container: 'ubuntu:16.04' }
67-
- { compiler: clang-3.6, cxxstd: '11,14', os: ubuntu-latest, container: 'ubuntu:16.04' }
68-
- { compiler: clang-3.7, cxxstd: '11,14', os: ubuntu-latest, container: 'ubuntu:16.04' }
69-
- { compiler: clang-3.8, cxxstd: '11,14', os: ubuntu-latest, container: 'ubuntu:16.04' }
70-
- { compiler: clang-3.9, cxxstd: '11,14', os: ubuntu-latest, container: 'ubuntu:18.04' }
71-
- { compiler: clang-4.0, cxxstd: '11,14', os: ubuntu-latest, container: 'ubuntu:18.04' }
72-
- { compiler: clang-5.0, cxxstd: '11,14,1z', os: ubuntu-latest, container: 'ubuntu:18.04' }
73-
- { compiler: clang-6.0, cxxstd: '11,14,17', os: ubuntu-latest, container: 'ubuntu:18.04' }
74-
- { compiler: clang-7, cxxstd: '11,14,17', os: ubuntu-latest, container: 'ubuntu:18.04' }
69+
- { compiler: clang-3.5, cxxstd: '11', os: ubuntu-latest, container: 'ubuntu:16.04' }
70+
- { compiler: clang-3.6, cxxstd: '11,14', os: ubuntu-latest, container: 'ubuntu:16.04' }
71+
- { compiler: clang-3.7, cxxstd: '11,14', os: ubuntu-latest, container: 'ubuntu:16.04' }
72+
- { compiler: clang-3.8, cxxstd: '11,14', os: ubuntu-latest, container: 'ubuntu:16.04' }
73+
- { compiler: clang-3.9, cxxstd: '11,14', os: ubuntu-latest, container: 'ubuntu:18.04' }
74+
- { compiler: clang-4.0, cxxstd: '11,14', os: ubuntu-latest, container: 'ubuntu:18.04' }
75+
- { compiler: clang-5.0, cxxstd: '11,14,1z', os: ubuntu-latest, container: 'ubuntu:18.04' }
76+
- { compiler: clang-6.0, cxxstd: '11,14,17', os: ubuntu-20.04 }
77+
- { compiler: clang-7, cxxstd: '11,14,17', os: ubuntu-20.04 }
7578
# Note: clang-8 does not fully support C++20, so it is not compatible with some libstdc++ versions in this mode
76-
- { compiler: clang-8, cxxstd: '11,14,17,2a', os: ubuntu-latest, container: 'ubuntu:18.04', install: 'clang-8 g++-7', gcc_toolchain: 7 }
79+
- { compiler: clang-8, cxxstd: '11,14,17,2a', os: ubuntu-20.04 , install: 'clang-8 g++-7', gcc_toolchain: 7 }
7780
- { compiler: clang-9, cxxstd: '11,14,17,2a', os: ubuntu-20.04 }
7881
- { compiler: clang-10, cxxstd: '11,14,17,20', os: ubuntu-20.04 }
7982
- { compiler: clang-11, cxxstd: '11,14,17,20', os: ubuntu-20.04 }
@@ -88,16 +91,16 @@ jobs:
8891
- { compiler: clang-18, cxxstd: '11,14,17,20,23,2c', os: ubuntu-24.04 }
8992

9093
# libc++
91-
- { compiler: clang-6.0, cxxstd: '03,11,14', os: ubuntu-latest, container: 'ubuntu:18.04', stdlib: libc++, install: 'clang-6.0 libc++-dev libc++abi-dev' }
92-
- { compiler: clang-12, cxxstd: '03,11,14,17,20', os: ubuntu-20.04, stdlib: libc++, install: 'clang-12 libc++-12-dev libc++abi-12-dev' }
94+
- { 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' }
95+
- { compiler: clang-12, cxxstd: '11,14,17,20', os: ubuntu-20.04, stdlib: libc++, install: 'clang-12 libc++-12-dev libc++abi-12-dev' }
9396
- { name: Clang w/ sanitizers, sanitize: yes,
94-
compiler: clang-14, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, stdlib: libc++, install: 'clang-14 libc++-14-dev libc++abi-14-dev' }
97+
compiler: clang-14, cxxstd: '11,14,17,20', os: ubuntu-22.04, stdlib: libc++, install: 'clang-14 libc++-14-dev libc++abi-14-dev' }
9598

9699
# OSX, clang
97-
- { compiler: clang, cxxstd: '11,14,17,20', os: macos-12, sanitize: yes }
98100
- { name: MacOS w/ clang and sanitizers,
99101
compiler: clang, cxxstd: '11,14,17,20,2b', os: macos-13, sanitize: yes }
100102
- { compiler: clang, cxxstd: '11,14,17,20,2b', os: macos-14 }
103+
- { compiler: clang, cxxstd: '11,14,17,20,2b', os: macos-15 }
101104

102105
timeout-minutes: 120
103106
runs-on: ${{matrix.os}}

0 commit comments

Comments
 (0)