Skip to content

Commit a2a6ef7

Browse files
committed
Test more recent compiler and boost versions
1 parent 6b735c4 commit a2a6ef7

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

.github/workflows/ci.yml

+9-14
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,16 @@ jobs:
4242
matrix:
4343
include:
4444
# 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,20', boostBranch: boost-1.86.0, os: ubuntu-20.04 }
46+
- { compiler: gcc-14, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-24.04 }
47+
- { compiler: gcc-14, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-24.04 }
48+
4949
# 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 }
50+
- { compiler: clang-14, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-24.04 }
51+
- { compiler: clang-18, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-24.04 }
52+
- { compiler: clang-18, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-24.04 }
5353

54-
- { name: Collect coverage, coverage: yes,
55-
compiler: gcc-8, cxxstd: '14', boostBranch: master, os: ubuntu-20.04 }
54+
- { name: Collect coverage, coverage: yes, compiler: gcc-8, cxxstd: '14', boostBranch: boost-1.86.0, os: ubuntu-20.04 }
5655

5756
timeout-minutes: 120
5857
runs-on: ${{matrix.os}}
@@ -127,11 +126,7 @@ jobs:
127126

128127
- name: Boost build
129128
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
129+
B2_FLAGS="cxxstd=${{matrix.cxxstd}}"
135130
if [[ "${{matrix.coverage}}" == "yes" ]]; then
136131
B2_FLAGS="$B2_FLAGS cxxflags=--coverage linkflags=--coverage"
137132
fi

0 commit comments

Comments
 (0)