Skip to content

Commit f65ec37

Browse files
authored
Updated googletest version to v1.6.0 (#2031)
Failure occurred due to the deprecation of support for CMake versions earlier than 3.10. Since the Ubuntu GitHub runner uses CMake 3.31.6, which no longer supports versions prior to 3.10 in many cases, our pinned version of GoogleTest needed an update. Additionally, other dependencies, such as JSON and JSON Schema Validators, were updated to the minimum compatible versions, with 3.5 being the lowest supported. https://cmake.org/cmake/help/latest/release/3.31.html#deprecated-and-removed-features The change includes: - Pin googletest to latest v1.16.0 - yaml-cpp patch update `cmake_minimum_required(VERSION 3.10)` - json patch update `cmake_minimum_required(VERSION 3.10)` - json-schema-validator patch update `cmake_minimum_required(VERSION 3.10)` - Updated ubuntu-20.04 to ubuntu-22.04. **GitHub Actions is deprecating the ubuntu-20.04 runner**.
1 parent 028c7b2 commit f65ec37

File tree

6 files changed

+35
-10
lines changed

6 files changed

+35
-10
lines changed

.github/workflows/buildmgr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ jobs:
196196
create_installer:
197197
needs: [ setup, build, docs ]
198198
# Debian package generation in ubuntu 22.04 produces incompatible metadata
199-
runs-on: ubuntu-20.04
199+
runs-on: ubuntu-22.04
200200
timeout-minutes: 15
201201
steps:
202202
- name: Harden Runner

external/googletest

Submodule googletest updated 243 files

external/json-schema-validator.patch

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index e6aff61..fa90bc0 100644
2+
index e6aff61..8826dae 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5+
@@ -1,4 +1,4 @@
6+
-cmake_minimum_required(VERSION 3.2)
7+
+cmake_minimum_required(VERSION 3.10)
8+
9+
option(JSON_VALIDATOR_BUILD_TESTS "Build tests" ON)
10+
option(JSON_VALIDATOR_BUILD_EXAMPLES "Build examples" ON)
511
@@ -132,9 +132,9 @@ set(INSTALL_CMAKE_DIR "lib/cmake/${PROJECT_NAME}")
612
set(INSTALL_CMAKEDIR_ROOT share/cmake)
713

@@ -16,7 +22,7 @@ index e6aff61..fa90bc0 100644
1622
include(CMakePackageConfigHelpers)
1723
write_basic_package_version_file(
1824
diff --git a/src/json-validator.cpp b/src/json-validator.cpp
19-
index 0beb613..0a9122b 100644
25+
index 0beb613..4f3213f 100644
2026
--- a/src/json-validator.cpp
2127
+++ b/src/json-validator.cpp
2228
@@ -218,12 +218,16 @@ public:

external/json.patch

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index b93c6e47..11448a52 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -1,4 +1,4 @@
6+
-cmake_minimum_required(VERSION 3.1)
7+
+cmake_minimum_required(VERSION 3.10)
8+
9+
##
10+
## PROJECT
111
diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp
2-
index b4b180496..597f835d8 100644
12+
index b4b18049..597f835d 100644
313
--- a/include/nlohmann/detail/exceptions.hpp
414
+++ b/include/nlohmann/detail/exceptions.hpp
515
@@ -127,9 +127,8 @@ class parse_error : public exception
@@ -41,7 +51,7 @@ index b4b180496..597f835d8 100644
4151

4252
/// @brief exception indicating errors with iterators
4353
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
44-
index 92308c557..479aad4a5 100644
54+
index 92308c55..479aad4a 100644
4555
--- a/single_include/nlohmann/json.hpp
4656
+++ b/single_include/nlohmann/json.hpp
4757
@@ -2912,9 +2912,8 @@ class parse_error : public exception

external/yaml-cpp.patch

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 46dc180..b746ac1 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -1,5 +1,5 @@
6+
# 3.5 is actually available almost everywhere, but this a good minimum
7+
-cmake_minimum_required(VERSION 3.4)
8+
+cmake_minimum_required(VERSION 3.10)
9+
10+
# enable MSVC_RUNTIME_LIBRARY target property
11+
# see https://cmake.org/cmake/help/latest/policy/CMP0091.html
112
diff --git a/include/yaml-cpp/emittermanip.h b/include/yaml-cpp/emittermanip.h
213
index 976d149..ba73a48 100644
314
--- a/include/yaml-cpp/emittermanip.h
@@ -66,7 +77,7 @@ index 07cf81a..ed7d9cd 100644
6677
void convert_sequence_to_map(const shared_memory_holder& pMemory);
6778

6879
diff --git a/src/emitter.cpp b/src/emitter.cpp
69-
index 4d48307..d4485be 100644
80+
index 4d48307..a188cca 100644
7081
--- a/src/emitter.cpp
7182
+++ b/src/emitter.cpp
7283
@@ -721,7 +721,7 @@ Emitter& Emitter::Write(const std::string& str) {
@@ -167,6 +178,3 @@ index 9d0c790..37355aa 100644
167178
+
168179
} // namespace
169180
} // namespace YAML
170-
--
171-
2.34.1.windows.1
172-

libs/rtemodel/test/src/RteExampleTest.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ TEST_F(RteExampleTest, TestExamplePaths) {
8686

8787
RteExample *preIncludeExample = nullptr;
8888
RteExample *preIncludeEnvFolderExample = nullptr;
89+
8990
for (auto exampleIt = exampleList.begin(); exampleIt != exampleList.end(); exampleIt++) {
9091
RteExample *example = dynamic_cast<RteExample*>(*exampleIt);
9192
if (example == nullptr) {

0 commit comments

Comments
 (0)