Skip to content

Commit b100e37

Browse files
committed
Merge branch 'release/v0.3.1'
2 parents 097498c + 3c47ab9 commit b100e37

303 files changed

Lines changed: 12069 additions & 2068 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Amalgamation_Check
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
- main
8+
paths:
9+
- .github/workflows/amalgamation_check.yml
10+
- include/fkYAML/**
11+
- single_include/fkYAML/**
12+
pull_request:
13+
paths:
14+
- .github/workflows/amalgamation_check.yml
15+
- include/fkYAML/**
16+
- single_include/fkYAML/**
17+
workflow_dispatch:
18+
19+
concurrency:
20+
group: ${{github.workflow}}-${{github.ref || github.run_id}}
21+
cancel-in-progress: true
22+
23+
jobs:
24+
amalgamation-check:
25+
runs-on: ubuntu-latest
26+
permissions:
27+
contents: read
28+
timeout-minutes: 10
29+
30+
steps:
31+
- uses: actions/checkout@v3
32+
33+
- name: Check if the amalgamated header file is up-to-date.
34+
run: make check-amalgamate

.github/workflows/clang_format_check.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,17 @@ on:
55
branches:
66
- develop
77
- main
8-
- release/*
8+
paths:
9+
- .github/workflows/clang_format_check.yml
10+
- include/**
11+
- test/unit_test/**
12+
- .clang-format
913
pull_request:
14+
paths:
15+
- .github/workflows/clang_format_check.yml
16+
- include/**
17+
- test/unit_test/**
18+
- .clang-format
1019
workflow_dispatch:
1120

1221
concurrency:

.github/workflows/codeql.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches:
66
- "develop"
77
- "main"
8-
- "release/*"
98
pull_request:
109
schedule:
1110
- cron: '00 0 * * 1'

.github/workflows/coverage.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,21 @@ on:
55
branches:
66
- develop
77
- main
8-
- release/*
8+
paths:
9+
- .github/workflows/coverage.yml
10+
- cmake/**
11+
- include/**
12+
- test/**
13+
- CMakeLists.txt
14+
- Makefile
915
pull_request:
16+
paths:
17+
- .github/workflows/coverage.yml
18+
- cmake/**
19+
- include/**
20+
- test/**
21+
- CMakeLists.txt
22+
- Makefile
1023
workflow_dispatch:
1124

1225
jobs:

.github/workflows/macos.yml

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,21 @@ on:
55
branches:
66
- develop
77
- main
8-
- release/*
8+
paths:
9+
- .github/workflows/macos.yml
10+
- cmake/**
11+
- include/**
12+
- single_include/**
13+
- test/**
14+
- CMakeLists.txt
915
pull_request:
16+
paths:
17+
- .github/workflows/macos.yml
18+
- cmake/**
19+
- include/**
20+
- single_include/**
21+
- test/**
22+
- CMakeLists.txt
1023
workflow_dispatch:
1124

1225
concurrency:
@@ -17,12 +30,36 @@ env:
1730
JOBS: 4
1831

1932
jobs:
33+
macos-latest:
34+
timeout-minutes: 10
35+
runs-on: macos-latest
36+
strategy:
37+
matrix:
38+
build_type: [ Debug, Release ]
39+
single_header: ["ON", "OFF"]
40+
41+
steps:
42+
- uses: actions/checkout@v3
43+
with:
44+
submodules: recursive
45+
46+
- name: Configure CMake
47+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DFK_YAML_BUILD_TEST=ON -DFK_YAML_USE_SINGLE_HEADER=${{matrix.single_header}}
48+
49+
- name: Build
50+
run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}} -j ${{env.JOBS}}
51+
52+
- name: Test
53+
working-directory: ${{github.workspace}}/build
54+
run: ctest -C ${{matrix.build_type}} --output-on-failure -j ${{env.JOBS}}
55+
2056
xcode_for_macos11:
2157
timeout-minutes: 10
2258
runs-on: macos-11
2359
strategy:
2460
matrix:
2561
xcode: [ '11.7', '12.4', '12.5.1', '13.0', '13.1', '13.2.1' ]
62+
build_type: [ Debug, Release ]
2663
env:
2764
DEVELOPER_DIR: /Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer
2865

@@ -32,21 +69,22 @@ jobs:
3269
submodules: recursive
3370

3471
- name: Configure CMake
35-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Debug -DFK_YAML_BUILD_TEST=ON
72+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DFK_YAML_BUILD_TEST=ON
3673

3774
- name: Build
38-
run: cmake --build ${{github.workspace}}/build --config Debug -j ${{env.JOBS}}
75+
run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}} -j ${{env.JOBS}}
3976

4077
- name: Test
4178
working-directory: ${{github.workspace}}/build
42-
run: ctest -C Debug --output-on-failure -j${{env.JOBS}}
79+
run: ctest -C ${{matrix.build_type}} --output-on-failure -j${{env.JOBS}}
4380

4481
xcode_for_macos12:
4582
timeout-minutes: 10
4683
runs-on: macos-12
4784
strategy:
4885
matrix:
4986
xcode: [ '13.1', '13.2.1', '13.3.1', '13.4.1', '14.0.1', '14.1', '14.2' ]
87+
build_type: [ Debug, Release ]
5088
env:
5189
DEVELOPER_DIR: /Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer
5290

@@ -56,11 +94,11 @@ jobs:
5694
submodules: recursive
5795

5896
- name: Configure CMake
59-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Debug -DFK_YAML_BUILD_TEST=ON
97+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DFK_YAML_BUILD_TEST=ON
6098

6199
- name: Build
62-
run: cmake --build ${{github.workspace}}/build --config Debug -j ${{env.JOBS}}
100+
run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}} -j ${{env.JOBS}}
63101

64102
- name: Test
65103
working-directory: ${{github.workspace}}/build
66-
run: ctest -C Debug --output-on-failure -j${{env.JOBS}}
104+
run: ctest -C ${{matrix.build_type}} --output-on-failure -j${{env.JOBS}}

.github/workflows/publish_docs.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
branches:
77
- develop
88
paths:
9+
- .github/workflows/publish_docs.yml
10+
- docs/examples/**
911
- docs/mkdocs/**
1012
workflow_dispatch:
1113

@@ -29,8 +31,13 @@ jobs:
2931
with:
3032
submodules: recursive
3133

34+
- name: Build examples
35+
run: |
36+
cmake -B ${{github.workspace}}/build -S ${{github.workspace}} -DCMAKE_BUILD_TYPE=Debug -DFK_YAML_BUILD_EXAMPLES=ON
37+
cmake --build ${{github.workspace}}/build --config Debug
38+
3239
- name: Build documentation
33-
run: make build -C docs/mkdocs
40+
run: make -C docs/mkdocs build
3441

3542
- name: Setup Pages
3643
uses: actions/configure-pages@v3

.github/workflows/release_package.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,28 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [ubuntu-latest, windows-latest]
16+
single_header: ["ON", "OFF"]
1617
include:
1718
- os: ubuntu-latest
1819
artifact_name: fkYAML.tgz
20+
single_header: "ON"
21+
- os: ubuntu-latest
22+
artifact_name: fkYAML_single_header.tgz
23+
single_header: "OFF"
1924
- os: windows-latest
2025
artifact_name: fkYAML.zip
26+
single_header: "ON"
27+
- os: windows-latest
28+
artifact_name: fkYAML_single_header.zip
29+
single_header: "OFF"
2130

2231
steps:
2332
- uses: actions/checkout@v3
2433
with:
2534
submodules: recursive
2635

2736
- name: Configure CMake
28-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{github.workspace}}/build/package"
37+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{github.workspace}}/build/package" -DFK_YAML_USE_SINGLE_HEADER=${{matrix.single_header}}
2938

3039
- name: Install
3140
run: |

.github/workflows/ubuntu.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,27 @@ on:
55
branches:
66
- develop
77
- main
8-
- release/*
8+
paths:
9+
- .github/workflows/ubuntu.yml
10+
- cmake/**
11+
- include/**
12+
- single_include/**
13+
- test/**
14+
- tool/**
15+
- .clang-tidy
16+
- CMakeLists.txt
17+
- Makefile
918
pull_request:
19+
paths:
20+
- .github/workflows/ubuntu.yml
21+
- cmake/**
22+
- include/**
23+
- single_include/**
24+
- test/**
25+
- tool/**
26+
- .clang-tidy
27+
- CMakeLists.txt
28+
- Makefile
1029
workflow_dispatch:
1130

1231
env:
@@ -23,14 +42,15 @@ jobs:
2342
strategy:
2443
matrix:
2544
build_type: [ Debug, Release ]
45+
use_single_header: ["ON", "OFF"]
2646

2747
steps:
2848
- uses: actions/checkout@v3
2949
with:
3050
submodules: recursive
3151

3252
- name: Configure CMake
33-
run: cmake -B ${{github.workspace}}/build_${{matrix.build_type}} -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DFK_YAML_BUILD_TEST=ON
53+
run: cmake -B ${{github.workspace}}/build_${{matrix.build_type}} -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DFK_YAML_BUILD_TEST=ON -DFK_YAML_USE_SINGLE_HEADER=${{matrix.use_single_header}}
3454

3555
- name: Build
3656
run: cmake --build ${{github.workspace}}/build_${{matrix.build_type}} --config ${{matrix.build_type}} -j ${{env.JOBS}}

.github/workflows/windows.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,21 @@ on:
55
branches:
66
- develop
77
- main
8-
- release/*
8+
paths:
9+
- .github/workflows/windows.yml
10+
- cmake/**
11+
- include/**
12+
- single_include/**
13+
- test/**
14+
- CMakeLists.txt
915
pull_request:
16+
paths:
17+
- .github/workflows/windows.yml
18+
- cmake/**
19+
- include/**
20+
- single_include/**
21+
- test/**
22+
- CMakeLists.txt
1023
workflow_dispatch:
1124

1225
concurrency:
@@ -23,14 +36,15 @@ jobs:
2336
strategy:
2437
matrix:
2538
build_type: [ Debug, Release ]
39+
single_header: ["ON", "OFF"]
2640

2741
steps:
2842
- uses: actions/checkout@v3
2943
with:
3044
submodules: recursive
3145

3246
- name: Configure CMake
33-
run: cmake -B ${{github.workspace}}/build -G "Visual Studio 16 2019" -A x64 -DFK_YAML_BUILD_TEST=ON
47+
run: cmake -B ${{github.workspace}}/build -G "Visual Studio 16 2019" -A x64 -DFK_YAML_BUILD_TEST=ON -DFK_YAML_USE_SINGLE_HEADER=${{matrix.single_header}}
3448

3549
- name: Build
3650
run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}} -j ${{env.JOBS}}
@@ -45,14 +59,15 @@ jobs:
4559
strategy:
4660
matrix:
4761
build_type: [ Debug, Release ]
62+
single_header: ["ON", "OFF"]
4863

4964
steps:
5065
- uses: actions/checkout@v3
5166
with:
5267
submodules: recursive
5368

5469
- name: Configure CMake
55-
run: cmake -B ${{github.workspace}}/build -G "Visual Studio 17 2022" -A x64 -DFK_YAML_BUILD_TEST=ON
70+
run: cmake -B ${{github.workspace}}/build -G "Visual Studio 17 2022" -A x64 -DFK_YAML_BUILD_TEST=ON -DFK_YAML_USE_SINGLE_HEADER=${{matrix.single_header}}
5671

5772
- name: Build
5873
run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}} -j ${{env.JOBS}}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/.vs/
44

55
# documentation
6+
/docs/mkdocs/docs/examples/
67
/docs/mkdocs/site/
78
/docs/mkdocs/venv/
89

0 commit comments

Comments
 (0)