Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/buildmgr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ jobs:
create_installer:
needs: [ setup, build, docs ]
# Debian package generation in ubuntu 22.04 produces incompatible metadata
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 15
steps:
- name: Harden Runner
Expand Down
2 changes: 1 addition & 1 deletion external/googletest
Submodule googletest updated 243 files
10 changes: 8 additions & 2 deletions external/json-schema-validator.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6aff61..fa90bc0 100644
index e6aff61..8826dae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.10)

option(JSON_VALIDATOR_BUILD_TESTS "Build tests" ON)
option(JSON_VALIDATOR_BUILD_EXAMPLES "Build examples" ON)
@@ -132,9 +132,9 @@ set(INSTALL_CMAKE_DIR "lib/cmake/${PROJECT_NAME}")
set(INSTALL_CMAKEDIR_ROOT share/cmake)

Expand All @@ -16,7 +22,7 @@ index e6aff61..fa90bc0 100644
include(CMakePackageConfigHelpers)
write_basic_package_version_file(
diff --git a/src/json-validator.cpp b/src/json-validator.cpp
index 0beb613..0a9122b 100644
index 0beb613..4f3213f 100644
--- a/src/json-validator.cpp
+++ b/src/json-validator.cpp
@@ -218,12 +218,16 @@ public:
Expand Down
14 changes: 12 additions & 2 deletions external/json.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b93c6e47..11448a52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.10)

##
## PROJECT
diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp
index b4b180496..597f835d8 100644
index b4b18049..597f835d 100644
--- a/include/nlohmann/detail/exceptions.hpp
+++ b/include/nlohmann/detail/exceptions.hpp
@@ -127,9 +127,8 @@ class parse_error : public exception
Expand Down Expand Up @@ -41,7 +51,7 @@ index b4b180496..597f835d8 100644

/// @brief exception indicating errors with iterators
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index 92308c557..479aad4a5 100644
index 92308c55..479aad4a 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -2912,9 +2912,8 @@ class parse_error : public exception
Expand Down
16 changes: 12 additions & 4 deletions external/yaml-cpp.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46dc180..b746ac1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
# 3.5 is actually available almost everywhere, but this a good minimum
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.10)

# enable MSVC_RUNTIME_LIBRARY target property
# see https://cmake.org/cmake/help/latest/policy/CMP0091.html
diff --git a/include/yaml-cpp/emittermanip.h b/include/yaml-cpp/emittermanip.h
index 976d149..ba73a48 100644
--- a/include/yaml-cpp/emittermanip.h
Expand Down Expand Up @@ -66,7 +77,7 @@ index 07cf81a..ed7d9cd 100644
void convert_sequence_to_map(const shared_memory_holder& pMemory);

diff --git a/src/emitter.cpp b/src/emitter.cpp
index 4d48307..d4485be 100644
index 4d48307..a188cca 100644
--- a/src/emitter.cpp
+++ b/src/emitter.cpp
@@ -721,7 +721,7 @@ Emitter& Emitter::Write(const std::string& str) {
Expand Down Expand Up @@ -167,6 +178,3 @@ index 9d0c790..37355aa 100644
+
} // namespace
} // namespace YAML
--
2.34.1.windows.1

1 change: 1 addition & 0 deletions libs/rtemodel/test/src/RteExampleTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ TEST_F(RteExampleTest, TestExamplePaths) {

RteExample *preIncludeExample = nullptr;
RteExample *preIncludeEnvFolderExample = nullptr;

for (auto exampleIt = exampleList.begin(); exampleIt != exampleList.end(); exampleIt++) {
RteExample *example = dynamic_cast<RteExample*>(*exampleIt);
if (example == nullptr) {
Expand Down
Loading