Skip to content

Commit 4bed69e

Browse files
Remerged the two files
1 parent 5847ce4 commit 4bed69e

2 files changed

Lines changed: 17 additions & 97 deletions

File tree

.github/workflows/linux-cxx20-gcc.yaml

Lines changed: 0 additions & 91 deletions
This file was deleted.
Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ env:
77

88
jobs:
99
linux-clang:
10-
env:
11-
CC: clang
12-
CXX: clang++
1310
strategy:
1411
fail-fast: false
1512
matrix:
@@ -20,6 +17,16 @@ jobs:
2017
compiler-version: 19
2118
- compiler: llvm
2219
compiler-version: 20
20+
- compiler: gcc
21+
compiler-version: 11
22+
- compiler: gcc
23+
compiler-version: 12
24+
- compiler: gcc
25+
compiler-version: 14
26+
env:
27+
if: matrix.compiler == 'llvm'
28+
CC: clang
29+
CXX: clang++
2330
name: "${{ github.job }} (${{ matrix.compiler }}-${{ matrix.compiler-version }})"
2431
runs-on: ubuntu-latest
2532
steps:
@@ -29,11 +36,17 @@ jobs:
2936
submodules: recursive
3037
fetch-depth: 0
3138
- name: Set up Clang
39+
if: matrix.compiler == 'llvm'
3240
uses: egor-tensin/setup-clang@v1
3341
with:
3442
version: ${{ matrix.compiler-version }}
3543
platform: x64
36-
script: |
44+
- name: Set up GCC
45+
if: matrix.compiler == 'gcc'
46+
uses: egor-tensin/setup-gcc@v1
47+
with:
48+
version: ${{ matrix.compiler-version }}
49+
platform: x64
3750
- name: Setup ccache
3851
uses: hendrikmuhs/ccache-action@v1
3952
with:
@@ -54,8 +67,6 @@ jobs:
5467
run: conan build . --build=missing -s compiler.cppstd=gnu20 -o *:with_capnproto=True -o *:with_cbor=True -o *:with_flatbuffers=True -o *:with_msgpack=True -o *:with_toml=True -o *:with_ubjson=True -o *:with_xml=True -o *:with_yaml=True
5568
- name: Compile
5669
run: |
57-
sudo ln -s $(which ccache) /usr/local/bin/$CC
58-
sudo ln -s $(which ccache) /usr/local/bin/$CXX
5970
$CXX --version
6071
cmake -S . -B build -G Ninja -DCMAKE_CXX_STANDARD=20 -DREFLECTCPP_BUILD_TESTS=ON -DREFLECTCPP_BUILD_BENCHMARKS=ON -DREFLECTCPP_BSON=ON -DREFLECTCPP_CAPNPROTO=ON -DREFLECTCPP_CBOR=ON -DREFLECTCPP_FLEXBUFFERS=ON -DREFLECTCPP_MSGPACK=ON -DREFLECTCPP_TOML=ON -DREFLECTCPP_XML=ON -DREFLECTCPP_YAML=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
6172
cmake --build build

0 commit comments

Comments
 (0)