@@ -42,17 +42,19 @@ jobs:
42
42
matrix :
43
43
include :
44
44
# Linux, gcc
45
- - { compiler: gcc-5, cxxstd: '14', boostBranch: boost-1.65.0, os: ubuntu-22.04, container: 'ubuntu:18.04' }
46
- - { compiler: gcc-5, cxxstd: '14', boostBranch: boost-1.77.0, os: ubuntu-22.04, container: 'ubuntu:18.04' }
47
- - { compiler: gcc-12,cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 }
48
-
45
+ - { compiler: gcc-7, cxxstd: '14,17', boostBranch: boost-1.86.0, os: ubuntu-20.04 }
46
+ - { compiler: gcc-10, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-22.04 }
47
+ - { compiler: gcc-12, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 }
48
+ - { compiler: gcc-14, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-24.04 }
49
+ - { compiler: gcc-14, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-24.04 }
50
+
49
51
# Linux, clang
50
- - { compiler: clang-5.0, cxxstd: '14', boostBranch: boost-1.65 .0, os: ubuntu-22 .04, container: 'ubuntu:18.04' }
51
- - { compiler: clang-5.0, cxxstd: '14', boostBranch: boost-1.77 .0, os: ubuntu-22 .04, container: 'ubuntu:18.04' }
52
- - { compiler: clang-14 , cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22 .04 }
52
+ - { compiler: clang-14, cxxstd: '14,17,20 ', boostBranch: boost-1.86 .0, os: ubuntu-24 .04 }
53
+ - { compiler: clang-18, cxxstd: '14,17,20 ', boostBranch: boost-1.86 .0, os: ubuntu-24 .04 }
54
+ - { compiler: clang-18 , cxxstd: '14,17,20', boostBranch: master, os: ubuntu-24 .04 }
53
55
54
56
- { name: Collect coverage, coverage: yes,
55
- compiler : gcc-8, cxxstd: '14', boostBranch: master, os: ubuntu-20.04 }
57
+ compiler : gcc-8, cxxstd: '14', boostBranch: boost-1.86.0, os: ubuntu-20.04 }
56
58
57
59
timeout-minutes : 120
58
60
runs-on : ${{matrix.os}}
@@ -127,11 +129,7 @@ jobs:
127
129
128
130
- name : Boost build
129
131
run : |
130
- if [[ "${{matrix.boostBranch}}" == "master" ]]; then
131
- B2_FLAGS="cxxstd=${{matrix.cxxstd}}"
132
- else
133
- B2_FLAGS="cxxflags=-std=c++${{matrix.cxxstd}}"
134
- fi
132
+ B2_FLAGS="cxxstd=${{matrix.cxxstd}}"
135
133
if [[ "${{matrix.coverage}}" == "yes" ]]; then
136
134
B2_FLAGS="$B2_FLAGS cxxflags=--coverage linkflags=--coverage"
137
135
fi
0 commit comments