From cf4eb6f6ed823615eecdff399ab7e9a3fecfa537 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Wed, 22 Jan 2025 13:19:50 -0600 Subject: [PATCH 1/3] Fix JSON strcmp against BSON array following mongo-c-driver f2c1bb79 --- src/bsoncxx/test/json.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bsoncxx/test/json.cpp b/src/bsoncxx/test/json.cpp index bbf8fb829e..e42b3e1762 100644 --- a/src/bsoncxx/test/json.cpp +++ b/src/bsoncxx/test/json.cpp @@ -62,7 +62,7 @@ TEST_CASE("empty array is converted correctly to json string") { using bsoncxx::to_json; auto doc = make_document(kvp("array", make_array())); - REQUIRE(to_json(doc.view()) == R"({ "array" : [ ] })"); + REQUIRE(to_json(doc.view()) == R"({ "array" : [ ] })"); } TEST_CASE("CXX-941 is resolved") { From 35e1b77f497abc39836e5db6b5fdbae952c11fbd Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Wed, 22 Jan 2025 13:21:47 -0600 Subject: [PATCH 2/3] Set downloaded mongoc version to f2c1bb79 --- .../config_generator/components/funcs/install_c_driver.py | 2 +- .evergreen/generated_configs/functions.yml | 2 +- CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.evergreen/config_generator/components/funcs/install_c_driver.py b/.evergreen/config_generator/components/funcs/install_c_driver.py index b1e5bfa507..3bc74a1eef 100644 --- a/.evergreen/config_generator/components/funcs/install_c_driver.py +++ b/.evergreen/config_generator/components/funcs/install_c_driver.py @@ -14,7 +14,7 @@ # Only LIBMONGOC_DOWNLOAD_VERSION needs to be updated when pinning to an unreleased commit. # If pinning to an unreleased commit, create a "Blocked" JIRA ticket with # a "depends on" link to the appropriate C Driver version release ticket. -MONGOC_VERSION_MINIMUM = '1.29.0' +MONGOC_VERSION_MINIMUM = 'f2c1bb7989177fa2ddba1a915e8423e46ee1defe' class InstallCDriver(Function): diff --git a/.evergreen/generated_configs/functions.yml b/.evergreen/generated_configs/functions.yml index 7ffb2061f2..0c447b3b1b 100644 --- a/.evergreen/generated_configs/functions.yml +++ b/.evergreen/generated_configs/functions.yml @@ -374,7 +374,7 @@ functions: type: setup params: updates: - - { key: mongoc_version_minimum, value: 1.29.0 } + - { key: mongoc_version_minimum, value: f2c1bb7989177fa2ddba1a915e8423e46ee1defe } - command: subprocess.exec type: setup params: diff --git a/CMakeLists.txt b/CMakeLists.txt index efa399b223..db690b8745 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ set(LIBBSON_REQUIRED_ABI_VERSION 1.0) # Also update etc/purls.txt. set(LIBMONGOC_REQUIRED_VERSION 1.29.0) -set(LIBMONGOC_DOWNLOAD_VERSION 1.29.0) +set(LIBMONGOC_DOWNLOAD_VERSION f2c1bb7989177fa2ddba1a915e8423e46ee1defe) set(LIBMONGOC_REQUIRED_ABI_VERSION 1.0) set(NEED_DOWNLOAD_C_DRIVER false) From 5db3be8f5083d81df3dd0217ecd6ac6d026040e9 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Wed, 22 Jan 2025 14:02:54 -0600 Subject: [PATCH 3/3] Add reference to CXX-3208 --- .../config_generator/components/funcs/install_c_driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/config_generator/components/funcs/install_c_driver.py b/.evergreen/config_generator/components/funcs/install_c_driver.py index 3bc74a1eef..935f8ed5d2 100644 --- a/.evergreen/config_generator/components/funcs/install_c_driver.py +++ b/.evergreen/config_generator/components/funcs/install_c_driver.py @@ -14,7 +14,7 @@ # Only LIBMONGOC_DOWNLOAD_VERSION needs to be updated when pinning to an unreleased commit. # If pinning to an unreleased commit, create a "Blocked" JIRA ticket with # a "depends on" link to the appropriate C Driver version release ticket. -MONGOC_VERSION_MINIMUM = 'f2c1bb7989177fa2ddba1a915e8423e46ee1defe' +MONGOC_VERSION_MINIMUM = 'f2c1bb7989177fa2ddba1a915e8423e46ee1defe' # CXX-3208: bump to 1.30.0 once released. class InstallCDriver(Function):