Skip to content

Update lib and apply PR for YAML Merge Key #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 90 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
9ee3928
Prevent trailing spaces when emitting literal strings (#1005)
theamarin Jul 5, 2021
0579ae3
Update version to 0.7.0.
jbeder Jul 10, 2021
b591d8a
Update node impl.h for GCC unused variable warning (#981)
JBPennington Jul 10, 2021
ef0bba1
Bump minimum cmake versions in gtest to eliminate cmake deprecation w…
jasonbeach Jul 15, 2021
79aa6d5
Add assert to enable compilation with libcxx + gcc (#947)
mjvankampen Jul 15, 2021
db6deed
Include name of anchor in invalid anchor error (#1015)
snowp Jul 23, 2021
6308112
Added UE-Wrapper link to Readme (#1024)
jwindgassen Aug 30, 2021
da1c8d3
Hide most of non-public symbols by default (#984)
pinotree Sep 25, 2021
0d9dbcf
Revert "Hide most of non-public symbols by default (#984)" (#1038)
jbeder Sep 28, 2021
0733aeb
Revert "Revert "Hide most of non-public symbols by default (#984)" (#…
pinotree Oct 10, 2021
393a02a
README.md revision (#732)
marcospb19 Oct 10, 2021
1713859
Remove unused code from parse util (#1048)
janisozaur Oct 13, 2021
2f89975
Use static_cast<unsigned char> on DecodeBase64 to prevent SEGV on neg…
Ngiong Oct 20, 2021
4564d9a
github actions for mac/linux/windows (#1056)
PhilipDeegan Oct 31, 2021
328d2d8
Fix .pc paths for absolute GNUInstallDirs (#1058)
r-burns Nov 3, 2021
2b65c65
Partially revert commit 0733aeb4 to make dll.h a non-generated file (…
hkarel Nov 23, 2021
634578e
Add github actions badge to README
jbeder Nov 23, 2021
5057a53
Fix github actions badge.
jbeder Nov 23, 2021
974349d
Fix typo in README about building shared libraries.
jbeder Dec 10, 2021
d8d9419
Fix shared library tests for Windows (#1074)
TheVice Dec 15, 2021
bce601f
Support the conversion for std::unordered_map (#932)
dota17 Jan 6, 2022
f8e1a7b
Add MinGW to build pipeline
TheVice Jan 27, 2022
cdf89fa
set POSITION_INDEPENDENT_CODE if BUILD_SHARED_LIBS=OFF (#1076)
christian-rauch Jan 27, 2022
26e3b70
Update old style cast from (T) to static_cast<T>.
Sam4uk Feb 8, 2022
edadfec
Update gtest to 1.11.0 (#1086)
acxz Feb 17, 2022
669af4e
Make YAML_MSVC_SHARED_RT depend on "CMAKE_SYSTEM_NAME MATCHES Windows…
theOtherMichael Apr 1, 2022
a6db7e3
Fix single cr not recognized (#1094)
vehre-x41 Apr 1, 2022
4aad2b1
Fix CMake export files (#1077)
felix2010 Apr 1, 2022
0e6e98e
Extend options that disable testing and formatting to looking for dep…
xiaozhuai Apr 1, 2022
7d06655
Allow yaml-cpp to be installed from another project (#1007)
SpaceIm Apr 3, 2022
4c982d5
Improve build and fix single cr on windows (#1099)
vehre-x41 Apr 19, 2022
13626af
Fix escaping anchors in keys (#1101)
vehre-x41 Apr 21, 2022
420c982
Improve bazel build for Windows. (#1100)
vehre-x41 Apr 27, 2022
190ad50
Remove redundant include (#1110)
hyperxor May 21, 2022
c73ee34
Small perfomance optimization in Directives and Tag methods (#1112)
hyperxor May 31, 2022
e87ed7e
Add the "make uninstall" target (#1130)
Skywol Sep 20, 2022
763b7d6
Fix compilation errors in build for Oracle Solaris OS (#1133)
rdzehtsiar Sep 20, 2022
255bf1f
Install pkgconfig and cmake files into arch-dependent locations (#1055)
tgurr Sep 20, 2022
c86a9e4
Minimize warnings when not the top-level project (#1124)
BMBurstein Sep 20, 2022
85ad599
Basic update to CMakeLists.txt to address #1116 (#1117)
stephematician Sep 20, 2022
97ebcf0
Export library directory and shared libs to CMake config (#1113)
darktohka Sep 20, 2022
4ae4cb7
Support conversion for std::valarray (#956)
sfalmo Sep 20, 2022
1b50109
Include property nodes in the long key check (#1140)
zenno-leaky-bucket Oct 4, 2022
bdc5582
Add tests for iterator and const_iterator on sequence (#1169)
MatthijsBurgh Mar 2, 2023
d7f672d
CI: define read-only permission for GitHub Workflow (#1175)
diogoteles08 Mar 4, 2023
3ff7ab0
Make sure tests are run in CI (#1170)
MatthijsBurgh Mar 4, 2023
55a8037
(appveyor) remove, because testing windows in GH actions (#1176)
MatthijsBurgh Mar 4, 2023
987a604
Delete .travis.yml (#1177)
MatthijsBurgh Mar 4, 2023
74f63c1
Move CTest to test entry (#1181)
jelin-sh Mar 21, 2023
0e6e28d
Revert "Move CTest to test entry (#1181)" (#1182)
jbeder Mar 23, 2023
b888265
Add namespace for the exported targets (#1196)
Ryanf55 Jun 28, 2023
35b4498
node/convert: support conversion for std::string_view (#1148)
tchaikov Jul 24, 2023
f6c8b17
Create Security-Policy (#1189)
diogoteles08 Aug 10, 2023
f732014
Bump version to 0.8.0.
jbeder Aug 10, 2023
c268020
Specify CMake policy range to avoid deprecation warning (#1211)
craigscott-crascit Aug 16, 2023
fcbb819
Fix testsuite with gcc-13 (#1216)
LocutusOfBorg Aug 19, 2023
6262201
node/convert: relax the check for string_view (#1222)
tchaikov Sep 6, 2023
2383e6d
Revert "node/convert: relax the check for string_view (#1222)" (#1225)
tchaikov Sep 10, 2023
016b2e7
CI: test with supported C++ standards (#1226)
tchaikov Sep 10, 2023
9f31491
bzlmodded (#1224)
stonier Sep 17, 2023
d046eea
node/convert: Enable the template specialization for `std::string_vie…
0xFireWolf Sep 17, 2023
37f1b8b
Update How-To-Emit-YAML.md (#976)
pauljurczak Sep 21, 2023
4c061a5
Disable `format` target when not building as the main project (#1231)
threeal Oct 11, 2023
ac144ed
Hide uninstall target unless YAML_CPP_INSTALL is set, and allow it to…
Megamouse Oct 11, 2023
c26e047
CMake: Fixes for generated config (#1212)
FtZPetruska Oct 12, 2023
8106fcf
Resolve warnings about unreferenced parameter 'style' in NullEventHan…
PJayB Oct 12, 2023
4fc5ec3
automatically create bzlmod archive for release (#1230)
zaucy Oct 12, 2023
f791b95
remove unncessary continue-on-error (#1234)
zaucy Oct 12, 2023
145eec5
Add CMake option YAML_USE_SYSTEM_GTEST to use system googletest if av…
LocutusOfBorg Oct 22, 2023
db03655
Make sure CXX_STANDARD can be overridden from outside (#1239)
LocutusOfBorg Oct 23, 2023
6bbc603
Adding support for handling YAML Merge Key (#41)
nlescoua Nov 4, 2023
30e6933
Fix yaml-cpp-config.cmake.in
Levi-Armstrong Nov 6, 2023
51adc5f
Update yaml-cpp-config.cmake.in
Levi-Armstrong Nov 6, 2023
1c5a38e
workflows/build.yml: Use debug std C++ library on Ubuntu
rico-chet Nov 26, 2023
eaf7205
README.md: Describe building with debug libstdc++ mode
rico-chet Nov 27, 2023
6292971
Fix merge-key handling in case the dictionary contains a sub-dictionary
nlescoua Dec 8, 2023
f30582f
ci: hash-pin sensitive workflow dependency
diogoteles08 Dec 13, 2023
c7639e8
ci: configure dependabot to montly update GHAs
diogoteles08 Dec 14, 2023
94710bb
Add default destructor to EmitFromEvents
Levi-Armstrong Dec 28, 2023
c28295b
Add CMake integration example
Trompettesib Oct 13, 2022
9eb1142
Fix GIT_TAG field in cmake integration example
Trompettesib Jan 4, 2024
c67d701
Fix indentation of empty sequences and add test
Alejandro-FA Jan 25, 2024
96f5c88
assign fallback value
Jan 26, 2024
4afd53b
Bump the github-actions group with 1 update
dependabot[bot] Jan 1, 2024
5c1bbbd
Skip Position Independent Code for PSP/PS3
humbertodias Feb 21, 2024
76dc671
Add option YAML_ENABLE_PIC=ON
humbertodias Feb 22, 2024
e5ba551
Merge remote-tracking branch 'upstream/master' into update-lib-and-me…
azat Apr 16, 2024
bcf7604
Fix merge operator support (that can be visible by iterating through …
azat May 3, 2024
2acec3d
Fix order for merging iterator
azat May 3, 2024
2ce752f
Merge branch 'merge-operator' into update-lib-and-merge-operator
azat May 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test/gtest-1.11.0
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
groups:
github-actions:
patterns:
- "*"

138 changes: 138 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
name: Github PR
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
workflow_dispatch:
permissions: read-all
defaults:
run:
shell: bash
jobs:
cmake-build:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
cxx_standard: [11, 17, 20]
build: [static, shared]
googletest: [build, system]
generator: ["Default Generator", "MinGW Makefiles"]
exclude:
- os: macos-latest
build: shared
- os: macos-latest
generator: "MinGW Makefiles"
- os: ubuntu-latest
generator: "MinGW Makefiles"
- os: macos-latest
googletest: system
- os: windows-latest
googletest: system
env:
YAML_BUILD_SHARED_LIBS: ${{ matrix.build == 'shared' && 'ON' || 'OFF' }}
YAML_USE_SYSTEM_GTEST: ${{ matrix.googletest == 'system' && 'ON' || 'OFF' }}
CMAKE_GENERATOR: >-
${{format(matrix.generator != 'Default Generator' && '-G "{0}"' || '', matrix.generator)}}
CMAKE_INSTALL_PREFIX: "${{ github.workspace }}/install-prefix"
CMAKE_BUILD_TYPE: Debug
CMAKE_CXX_FLAGS_DEBUG: ${{ matrix.googletest == 'build' && '-g -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC' || '-g' }}
runs-on: ${{ matrix.os }}
steps:

- uses: awalsh128/cache-apt-pkgs-action@latest
if: matrix.os == 'ubuntu-latest'
with:
packages: googletest libgmock-dev libgtest-dev
version: 1.0

- uses: actions/checkout@v4

- name: Configure
run: |
cmake \
${{ env.CMAKE_GENERATOR }} \
-S "${{ github.workspace }}" \
-B build \
-D CMAKE_CXX_STANDARD=${{ matrix.cxx_standard }} \
-D CMAKE_INSTALL_PREFIX="${{ env.CMAKE_INSTALL_PREFIX }}" \
-D CMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} \
-D CMAKE_CXX_FLAGS_DEBUG="${{ env.CMAKE_CXX_FLAGS_DEBUG }}" \
-D YAML_BUILD_SHARED_LIBS=${{ env.YAML_BUILD_SHARED_LIBS }} \
-D YAML_USE_SYSTEM_GTEST=${{ env.YAML_USE_SYSTEM_GTEST }} \
-D YAML_CPP_BUILD_TESTS=ON

- name: Build
run: |
cmake \
--build build \
--config ${{ env.CMAKE_BUILD_TYPE }} \
--verbose \
--parallel

- name: Run Tests
shell: bash
run: |
ctest \
--test-dir build \
--build-config ${{ env.CMAKE_BUILD_TYPE }} \
--output-on-failure \
--verbose

- name: Install
run: cmake --install build --config ${{ env.CMAKE_BUILD_TYPE }}

- name: Configure CMake package test
run: |
cmake \
${{ env.CMAKE_GENERATOR }} \
-S "${{ github.workspace }}/test/cmake" \
-B consumer-build \
-D CMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} \
-D CMAKE_PREFIX_PATH="${{ env.CMAKE_INSTALL_PREFIX }}"

- name: Build CMake package test
run: |
cmake \
--build consumer-build \
--config ${{ env.CMAKE_BUILD_TYPE }} \
--verbose

bazel-build:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4

- name: Build
run: |
cd "${{ github.workspace }}"
bazel build :all

- name: Test
run: |
cd "${{ github.workspace }}"
bazel test test

bzlmod-build:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4

- name: Build
shell: bash
run: |
cd "${{ github.workspace }}"
bazel build --enable_bzlmod :all

- name: Test
shell: bash
run: |
cd "${{ github.workspace }}"
bazel test --enable_bzlmod test
19 changes: 19 additions & 0 deletions .github/workflows/bzlmod-archive.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Bazel Release

on:
release:
types: [published]

jobs:
# A release archive is required for bzlmod
# See: https://blog.bazel.build/2023/02/15/github-archive-checksum.html
bazel-release-archive:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- run: git archive $GITHUB_REF -o "yaml-cpp-${GITHUB_REF:10}.tar.gz"
- run: gh release upload ${GITHUB_REF:10} "yaml-cpp-${GITHUB_REF:10}.tar.gz"
env:
GH_TOKEN: ${{ github.token }}
37 changes: 0 additions & 37 deletions .travis.yml

This file was deleted.

7 changes: 7 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
yaml_cpp_defines = select({
# On Windows, ensure static linking is used.
"@platforms//os:windows": ["YAML_CPP_STATIC_DEFINE", "YAML_CPP_NO_CONTRIB"],
"//conditions:default": [],
})

cc_library(
name = "yaml-cpp_internal",
visibility = ["//:__subpackages__"],
Expand All @@ -11,4 +17,5 @@ cc_library(
includes = ["include"],
hdrs = glob(["include/**/*.h"]),
srcs = glob(["src/**/*.cpp", "src/**/*.h"]),
defines = yaml_cpp_defines,
)
Loading