Skip to content

Commit b44474d

Browse files
committed
Merge branch 'release/v0.3.4'
2 parents 3a5f14f + 470a3de commit b44474d

100 files changed

Lines changed: 7645 additions & 4159 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.

.github/workflows/macos.yml

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ concurrency:
2626
group: ${{github.workflow}}-${{github.ref || github.run_id}}
2727
cancel-in-progress: true
2828

29-
env:
30-
JOBS: 3
31-
3229
jobs:
3330
macos-latest:
3431
timeout-minutes: 10
@@ -37,6 +34,8 @@ jobs:
3734
matrix:
3835
build_type: [ Debug, Release ]
3936
single_header: ["ON", "OFF"]
37+
env:
38+
JOBS: 2
4039

4140
steps:
4241
- uses: actions/checkout@v4
@@ -62,6 +61,7 @@ jobs:
6261
build_type: [ Debug, Release ]
6362
env:
6463
DEVELOPER_DIR: /Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer
64+
JOBS: 2
6565

6666
steps:
6767
- uses: actions/checkout@v4
@@ -87,6 +87,7 @@ jobs:
8787
build_type: [ Debug, Release ]
8888
env:
8989
DEVELOPER_DIR: /Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer
90+
JOBS: 2
9091

9192
steps:
9293
- uses: actions/checkout@v4
@@ -112,6 +113,33 @@ jobs:
112113
build_type: [ Debug, Release ]
113114
env:
114115
DEVELOPER_DIR: /Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer
116+
JOBS: 3
117+
118+
steps:
119+
- uses: actions/checkout@v4
120+
with:
121+
submodules: recursive
122+
123+
- name: Configure CMake
124+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DFK_YAML_BUILD_TEST=ON
125+
126+
- name: Build
127+
run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}} -j ${{env.JOBS}}
128+
129+
- name: Test
130+
working-directory: ${{github.workspace}}/build
131+
run: ctest -C ${{matrix.build_type}} --output-on-failure -j ${{env.JOBS}}
132+
133+
xcode_for_macos14:
134+
timeout-minutes: 10
135+
runs-on: macos-14
136+
strategy:
137+
matrix:
138+
xcode: [ '14.3.1', '15.0.1', '15.1', '15.2', '15.3' ]
139+
build_type: [ Debug, Release ]
140+
env:
141+
DEVELOPER_DIR: /Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer
142+
JOBS: 2
115143

116144
steps:
117145
- uses: actions/checkout@v4

.reuse/templates/fkYAML.commented.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// _______ __ __ __ _____ __ __ __
22
/// | __| |_/ | \_/ |/ _ \ / \/ \| | fkYAML: A C++ header-only YAML library
3-
/// | __| _ < \_ _/| ___ | _ | |___ version 0.3.3
3+
/// | __| _ < \_ _/| ___ | _ | |___ version 0.3.4
44
/// |__| |_| \__| |_| |_| |_|___||___|______| https://github.com/fktn-k/fkYAML
55
///
66
{% for copyright_line in copyright_lines %}

.reuse/templates/fkYAML_support.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
_______ __ __ __ _____ __ __ __
22
| __| |_/ | \_/ |/ _ \ / \/ \| | fkYAML: A C++ header-only YAML library (supporting code)
3-
| __| _ < \_ _/| ___ | _ | |___ version 0.3.3
3+
| __| _ < \_ _/| ___ | _ | |___ version 0.3.4
44
|__| |_| \__| |_| |_| |_|___||___|______| https://github.com/fktn-k/fkYAML
55

66
{% for copyright_line in copyright_lines %}

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Changelog
22

3+
## [v0.3.4](https://github.com/fktn-k/fkYAML/releases/tag/v0.3.4) (2024-04-20)
4+
5+
[Full Changelog](https://github.com/fktn-k/fkYAML/compare/v0.3.3...v0.3.4)
6+
7+
- Fix Valgrind error in the test suite [\#307](https://github.com/fktn-k/fkYAML/pull/307) ([fktn-k](https://github.com/fktn-k))
8+
9+
- \#181 Serialize container tags [\#314](https://github.com/fktn-k/fkYAML/pull/314) ([fktn-k](https://github.com/fktn-k))
10+
- \#294 Support std::basic\_string\_view [\#313](https://github.com/fktn-k/fkYAML/pull/313) ([fktn-k](https://github.com/fktn-k))
11+
- updated dependencies for mkdocs to the latest versions [\#312](https://github.com/fktn-k/fkYAML/pull/312) ([fktn-k](https://github.com/fktn-k))
12+
- Organized the contents of the test suite [\#311](https://github.com/fktn-k/fkYAML/pull/311) ([fktn-k](https://github.com/fktn-k))
13+
- Add workflow jobs with the macOS14 runner image [\#310](https://github.com/fktn-k/fkYAML/pull/310) ([fktn-k](https://github.com/fktn-k))
14+
- support tags for container nodes with some cleanup in test suite [\#309](https://github.com/fktn-k/fkYAML/pull/309) ([fktn-k](https://github.com/fktn-k))
15+
- Defer scalar conversions [\#308](https://github.com/fktn-k/fkYAML/pull/308) ([fktn-k](https://github.com/fktn-k))
16+
- Scan inputs using iterators [\#306](https://github.com/fktn-k/fkYAML/pull/306) ([fktn-k](https://github.com/fktn-k))
17+
- \#181 support tag for scalars [\#305](https://github.com/fktn-k/fkYAML/pull/305) ([fktn-k](https://github.com/fktn-k))
18+
319
## [v0.3.3](https://github.com/fktn-k/fkYAML/releases/tag/v0.3.3) (2024-03-31)
420

521
[Full Changelog](https://github.com/fktn-k/fkYAML/compare/v0.3.2...v0.3.3)

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.8)
66

77
project(
88
fkYAML
9-
VERSION 0.3.3
9+
VERSION 0.3.4
1010
LANGUAGES CXX)
1111

1212
#############################################################

Makefile

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: update-version-macros CHANGELOG.md update-version fkYAML.natvis
1+
.PHONY: update-version-macros CHANGELOG.md update-version examples fkYAML.natvis
22

33
#################
44
# variables #
@@ -14,7 +14,7 @@ TEST_SRCS = $(shell find test -type f \( -name '*.hpp' -o -name '*.cpp' \) | sor
1414
# target version definition
1515
TARGET_MAJOR_VERSION := 0
1616
TARGET_MINOR_VERSION := 3
17-
TARGET_PATCH_VERSION := 3
17+
TARGET_PATCH_VERSION := 4
1818
TARGET_VERSION_FULL := $(TARGET_MAJOR_VERSION).$(TARGET_MINOR_VERSION).$(TARGET_PATCH_VERSION)
1919
VERSION_MACRO_FILE := include/fkYAML/detail/macros/version_macros.hpp
2020

@@ -96,6 +96,20 @@ update-params-for-natvis:
9696
fkYAML.natvis: update-params-for-natvis
9797
@$(MAKE) -C ./tool/natvis_generator generate
9898

99+
#####################
100+
# Documentation #
101+
#####################
102+
103+
examples:
104+
cmake -B build_examples -S . -DCMAKE_BUILD_TYPE=Debug -DFK_YAML_BUILD_EXAMPLES=ON
105+
cmake --build build_examples --config Debug
106+
107+
build-docs: examples
108+
@$(MAKE) -C ./docs/mkdocs build
109+
110+
serve-docs: examples
111+
@$(MAKE) -C serve
112+
99113
###############
100114
# Version #
101115
###############
@@ -169,5 +183,6 @@ clean:
169183
build_clang_sanitizers \
170184
build_clang_tidy \
171185
build_coverage \
186+
build_examples \
172187
build_iwyu \
173188
build_valgrind

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ There are a lot of YAML libraries out there, and each may have its reason to exi
3030
fkYAML has been developed with these design goals:
3131

3232
### :briefcase: **Portable**
33-
The whole code depends only on C++ standards, and is carefully designed to work on many platforms so that fkYAML can be imported into existing C++ projects written in C++11 or later.
33+
The whole code depends only on C++ standards, and is carefully designed to work on many platforms so that fkYAML can be imported into existing C++ projects written in C++11 or better.
3434
No external dependencies, no sub-project, or no additional compiler flags are required.
3535
Although fkYAML is a library with multiple header files by default, you can use the single-header version located in the [single_include](https://github.com/fktn-k/tree/develop/single_include) directory.
3636
Furthermore, the project supports [CMake](https://cmake.org/) and provides [the documentation exclusively for CMake integration](https://fktn-k.github.io/fkYAML/tutorials/cmake_integration).
@@ -98,8 +98,12 @@ Currently, the following compilers are known to work and used in GitHub Actions
9898
| AppleClang 14.0.0.14000029 | [macOS 12](https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md) |
9999
| AppleClang 14.0.0.14000029 | [macOS 13](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md) |
100100
| AppleClang 14.0.3.14030022 | [macOS 13](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md) |
101+
| AppleClang 14.0.3.14030022 | [macOS 14](https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md) |
101102
| AppleClang 15.0.0.15000040 | [macOS 13](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md) |
103+
| AppleClang 15.0.0.15000040 | [macOS 14](https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md) |
102104
| AppleClang 15.0.0.15000100 | [macOS 13](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md) |
105+
| AppleClang 15.0.0.15000100 | [macOS 14](https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md) |
106+
| AppleClang 15.0.0.15000309 | [macOS 14](https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md) |
103107
| Clang 3.5.2 | [Ubuntu 22.04](https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md) |
104108
| Clang 3.6.2 | [Ubuntu 22.04](https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md) |
105109
| Clang 3.7.1 | [Ubuntu 22.04](https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md) |
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#include <iostream>
2+
#include <fkYAML/node.hpp>
3+
4+
int main()
5+
{
6+
// create a YAML node.
7+
fkyaml::node n = 123;
8+
9+
// set a tag name to the node.
10+
n.add_tag_name("!!int");
11+
std::cout << n.get_tag_name() << std::endl;
12+
13+
// overwrite it with a new one.
14+
n.add_tag_name("!!foo");
15+
std::cout << n.get_tag_name() << std::endl;
16+
17+
return 0;
18+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
!!int
2+
!!foo

docs/examples/ex_basic_node_get_anchor_name.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ int main()
1616
std::cout << e.what() << std::endl;
1717
}
1818

19-
// add an anchor name to the node.
19+
// set an anchor name to the node.
2020
n.add_anchor_name("anchor");
2121
std::cout << n.get_anchor_name() << std::endl;
2222

0 commit comments

Comments
 (0)