Skip to content

Commit 8517fb7

Browse files
committed
Merge branch 'release/v0.4.1'
2 parents 5fdd76e + 0d43eff commit 8517fb7

521 files changed

Lines changed: 6414 additions & 3953 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.

.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Checks: '*,
33
-altera-id-dependent-backward-branch,
44
-altera-struct-pack-align,
55
-altera-unroll-loops,
6+
-bugprone-easily-swappable-parameters,
67
-cert-dcl21-cpp,
78
-cppcoreguidelines-avoid-c-arrays,
89
-cppcoreguidelines-avoid-do-while,
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

.github/workflows/coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- .github/workflows/coverage.yml
1010
- cmake/**
1111
- include/**
12-
- test/**
12+
- tests/**
1313
- CMakeLists.txt
1414
- Makefile
1515
# to grant pull-requests write permission to fork repos as well
@@ -18,7 +18,7 @@ on:
1818
- .github/workflows/coverage.yml
1919
- cmake/**
2020
- include/**
21-
- test/**
21+
- tests/**
2222
- CMakeLists.txt
2323
- Makefile
2424
workflow_dispatch:

.github/workflows/format_check.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ on:
1010
- include/**
1111
- scripts/**
1212
- single_include/**
13-
- test/**
14-
- tool/amalgamation/**
13+
- tests/**
14+
- tools/amalgamation/**
1515
- CMakeLists.txt
1616
- .clang-format
1717
# to grant contents write permission to fork repos as well
@@ -21,8 +21,8 @@ on:
2121
- include/**
2222
- scripts/**
2323
- single_include/**
24-
- test/**
25-
- tool/amalgamation/**
24+
- tests/**
25+
- tools/amalgamation/**
2626
- CMakeLists.txt
2727
- .clang-format
2828
workflow_dispatch:

.github/workflows/macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ on:
1010
- cmake/**
1111
- include/**
1212
- single_include/**
13-
- test/**
13+
- tests/**
1414
- CMakeLists.txt
1515
pull_request:
1616
paths:
1717
- .github/workflows/macos.yml
1818
- cmake/**
1919
- include/**
2020
- single_include/**
21-
- test/**
21+
- tests/**
2222
- CMakeLists.txt
2323
workflow_dispatch:
2424

.github/workflows/publish_docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
- develop
88
paths:
99
- .github/workflows/publish_docs.yml
10-
- docs/examples/**
11-
- docs/mkdocs/**
10+
- examples/**
11+
- docs/**
1212
workflow_dispatch:
1313

1414
# no cancellation during uploads to avoid broken publications
@@ -37,15 +37,15 @@ jobs:
3737
cmake --build ${{github.workspace}}/build --config Debug
3838
3939
- name: Build documentation
40-
run: make -C docs/mkdocs build
40+
run: make build-docs
4141

4242
- name: Setup Pages
4343
uses: actions/configure-pages@v4
4444

4545
- name: Upload API documents
4646
uses: actions/upload-pages-artifact@v3
4747
with:
48-
path: ${{github.workspace}}/docs/mkdocs/site
48+
path: ${{github.workspace}}/docs/site
4949

5050
deploy:
5151
if: github.repository == 'fktn-k/fkYAML'

.github/workflows/release_package.yml

Lines changed: 53 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,52 +9,75 @@ on:
99
jobs:
1010
create_package:
1111
timeout-minutes: 10
12-
runs-on: ${{matrix.os}}
12+
runs-on: ubuntu-latest # Since fkYAML is a header-only library, just using ubuntu-latest is enough for packaging.
1313
strategy:
1414
matrix:
15-
os: [ubuntu-latest, windows-latest]
1615
single_header: ["ON", "OFF"]
1716
include:
18-
- os: ubuntu-latest
19-
artifact_name: fkYAML.tgz
17+
- artifact_name: fkYAML
2018
single_header: "OFF"
21-
- os: ubuntu-latest
22-
artifact_name: fkYAML_single_header.tgz
23-
single_header: "ON"
24-
- os: windows-latest
25-
artifact_name: fkYAML.zip
26-
single_header: "OFF"
27-
- os: windows-latest
28-
artifact_name: fkYAML_single_header.zip
19+
- artifact_name: fkYAML_single_header
2920
single_header: "ON"
3021

3122
steps:
3223
- uses: actions/checkout@v4
33-
with:
34-
submodules: recursive
24+
25+
- name: install zip
26+
run: sudo apt-get install zip
3527

3628
- name: Configure CMake
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}}
29+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{github.workspace}}/build/${{matrix.artifact_name}}" -DFK_YAML_USE_SINGLE_HEADER=${{matrix.single_header}}
3830

3931
- name: Install
4032
run: |
4133
cmake --build ${{github.workspace}}/build --config Release --target install
42-
ls ${{github.workspace}}/build/package
34+
ls -lAR ${{github.workspace}}/build/${{matrix.artifact_name}}
4335
44-
- name: Package
45-
shell: bash
36+
- name: Create tgz/zip archives of the install package
4637
run: |
47-
ls '${{github.workspace}}/build'
48-
if [[ "${{ matrix.os }}" == "windows-latest" ]]
49-
then
50-
7z a ${{matrix.artifact_name}} '${{github.workspace}}/build/package'
51-
else
52-
tar czvf ${{matrix.artifact_name}} '${{github.workspace}}/build/package'
53-
fi
54-
ls
55-
56-
- name: Upload Artifacts
38+
cd ${{github.workspace}}/build
39+
tar czvf '${{matrix.artifact_name}}.tgz' ./${{matrix.artifact_name}}
40+
zip -r '${{matrix.artifact_name}}.zip' ./${{matrix.artifact_name}}
41+
42+
- name: Upload Artifacts (tgz)
43+
uses: actions/upload-artifact@v4
44+
with:
45+
name: '${{matrix.artifact_name}}.tgz'
46+
path: '${{github.workspace}}/build/${{matrix.artifact_name}}.tgz'
47+
48+
- name: Upload Artifacts (zip)
49+
uses: actions/upload-artifact@v4
50+
with:
51+
name: '${{matrix.artifact_name}}.zip'
52+
path: '${{github.workspace}}/build/${{matrix.artifact_name}}.zip'
53+
54+
create_minimum_archive:
55+
timeout-minutes: 10
56+
runs-on: ubuntu-latest
57+
58+
steps:
59+
- uses: actions/checkout@v4
60+
61+
- name: install zip
62+
run: sudo apt-get install zip
63+
64+
- name: Create minimum tgz & zip archives
65+
working-directory: ${{github.workspace}}
66+
run: | # create a tgz archive which contains minimum required files to be used as a CMake project (e.g., using FetchContent).
67+
mkdir fkYAML_min
68+
cp -vr CMakeLists.txt fkYAML.natvis LICENSE.txt README.md include single_include ./fkYAML_min
69+
tar czvf fkYAML_min.tgz ./fkYAML_min
70+
zip -r fkYAML_min.zip ./fkYAML_min
71+
rm -rf ./fkYAML_min
72+
73+
- name: Upload the minimum archive (tgz)
74+
uses: actions/upload-artifact@v4
75+
with:
76+
name: fkYAML_min.tgz
77+
path: '${{github.workspace}}/fkYAML_min.tgz'
78+
79+
- name: Upload the minimum archive (zip)
5780
uses: actions/upload-artifact@v4
5881
with:
59-
name: ${{matrix.artifact_name}}
60-
path: ${{matrix.artifact_name}}
82+
name: fkYAML_min.zip
83+
path: '${{github.workspace}}/fkYAML_min.zip'

0 commit comments

Comments
 (0)