Skip to content

Commit aa04bb7

Browse files
Split up macOS as well
1 parent e89a631 commit aa04bb7

2 files changed

Lines changed: 8 additions & 30 deletions

File tree

.github/workflows/macos.yaml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
os: ["macos-latest", "macos-13"]
14+
format: ["JSON", "AVRO", "CAPNPROTO", "CBOR", "FLEXBUFFERS", "MSGPACK", "XML", "TOML", "UBJSON", "YAML"]
15+
name: "${{ matrix.os }} (${{ matrix.format }})"
1416
runs-on: ${{ matrix.os }}
1517
steps:
1618
- name: Checkout
@@ -39,26 +41,12 @@ jobs:
3941
export CMAKE_GENERATOR=Ninja
4042
fi
4143
$CXX --version
42-
cmake -S . -B build -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_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
44+
if [[ "${{ matrix.format == 'JSON' }}" == "true" ]]; then
45+
cmake -S . -B build -DCMAKE_CXX_STANDARD=20 -DREFLECTCPP_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
46+
else
47+
cmake -S . -B build -DCMAKE_CXX_STANDARD=20 -DREFLECTCPP_BUILD_TESTS=ON -DREFLECTCPP_JSON=OFF -DREFLECTCPP_${{ matrix.format }}=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
48+
fi
4349
cmake --build build -j 4
4450
- name: Run tests
4551
run: |
4652
ctest --test-dir build --output-on-failure
47-
- name: Run benchmarks
48-
run: |
49-
echo '# Benchmarks' >> $GITHUB_STEP_SUMMARY
50-
echo '## Benchmarks across different formats' >> $GITHUB_STEP_SUMMARY
51-
echo '```' >> $GITHUB_STEP_SUMMARY
52-
./build/benchmarks/all/reflect-cpp-all-format-benchmarks --benchmark_filter=canada_read >> $GITHUB_STEP_SUMMARY
53-
./build/benchmarks/all/reflect-cpp-all-format-benchmarks --benchmark_filter=canada_write >> $GITHUB_STEP_SUMMARY
54-
./build/benchmarks/all/reflect-cpp-all-format-benchmarks --benchmark_filter=licenses_read >> $GITHUB_STEP_SUMMARY
55-
./build/benchmarks/all/reflect-cpp-all-format-benchmarks --benchmark_filter=licenses_write >> $GITHUB_STEP_SUMMARY
56-
./build/benchmarks/all/reflect-cpp-all-format-benchmarks --benchmark_filter=person_read >> $GITHUB_STEP_SUMMARY
57-
./build/benchmarks/all/reflect-cpp-all-format-benchmarks --benchmark_filter=person_write >> $GITHUB_STEP_SUMMARY
58-
echo '```' >> $GITHUB_STEP_SUMMARY
59-
echo '## Benchmarks for JSON' >> $GITHUB_STEP_SUMMARY
60-
echo '```' >> $GITHUB_STEP_SUMMARY
61-
./build/benchmarks/json/reflect-cpp-json-benchmarks --benchmark_filter=person_read >> $GITHUB_STEP_SUMMARY
62-
./build/benchmarks/json/reflect-cpp-json-benchmarks --benchmark_filter=canada >> $GITHUB_STEP_SUMMARY
63-
./build/benchmarks/json/reflect-cpp-json-benchmarks --benchmark_filter=licenses >> $GITHUB_STEP_SUMMARY
64-
echo '```' >> $GITHUB_STEP_SUMMARY

.github/workflows/windows.yaml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
include:
14-
- format: JSON
15-
- format: BSON
16-
- format: CAPNPROTO
17-
- format: CBOR
18-
- format: FLEXBUFFERS
19-
- format: MSGPACK
20-
- format: XML
21-
- format: TOML
22-
- format: UBJSON
23-
- format: YAML
13+
format: ["JSON", "CAPNPROTO", "CBOR", "FLEXBUFFERS", "MSGPACK", "XML", "TOML", "UBJSON", "YAML"]
2414
name: "windows-msvc (${{ matrix.format }})"
2515
runs-on: windows-latest
2616
steps:

0 commit comments

Comments
 (0)