Skip to content
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

PHPC-2448: Update to libmongoc 1.28.0 #1673

Merged
merged 1 commit into from
Sep 23, 2024
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
6 changes: 2 additions & 4 deletions .evergreen/config/generated/build/build-libmongoc.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions .evergreen/config/templates/build/build-libmongoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
- func: "compile driver"
vars:
PHP_VERSION: "%phpVersion%"
# TODO: Change to "1.28.0" once 1.28.0 is released
LIBMONGOC_VERSION: "master"
LIBMONGOC_VERSION: "1.28.0"
- func: "upload build"

- name: "build-php-%phpVersion%-libmongoc-next-stable"
Expand All @@ -20,8 +19,7 @@
- func: "compile driver"
vars:
PHP_VERSION: "%phpVersion%"
# TODO: Change to "r1.28" once 1.28.0 is released
LIBMONGOC_VERSION: "master"
LIBMONGOC_VERSION: "r1.28"
- func: "upload build"

- name: "build-php-%phpVersion%-libmongoc-latest"
Expand Down
28 changes: 14 additions & 14 deletions sbom.json
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
{
"components": [
{
"bom-ref": "pkg:github/mongodb/libmongocrypt@1.10.1",
"bom-ref": "pkg:github/mongodb/libmongocrypt@1.11.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this was missed in da39d53.

I noted that we have Update SBOM file in the contributing docs, but I likely would have forgotten to do this myself.

Is it feasible to try and catch this in CI? Having it checked before allowing a release would be sufficient, as there's likely no harm in it being temporarily out of sync for the development branch.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I filed PHPC-2450 to track this.

"externalReferences": [
{
"type": "distribution",
"url": "https://github.com/mongodb/libmongocrypt/archive/refs/tags/1.10.1.tar.gz"
"url": "https://github.com/mongodb/libmongocrypt/archive/refs/tags/1.11.0.tar.gz"
},
{
"type": "website",
"url": "https://github.com/mongodb/libmongocrypt/tree/1.10.1"
"url": "https://github.com/mongodb/libmongocrypt/tree/1.11.0"
}
],
"group": "mongodb",
"name": "libmongocrypt",
"purl": "pkg:github/mongodb/libmongocrypt@1.10.1",
"purl": "pkg:github/mongodb/libmongocrypt@1.11.0",
"type": "library",
"version": "1.10.1"
"version": "1.11.0"
},
{
"bom-ref": "pkg:github/mongodb/mongo-c-driver@1.27.2",
"bom-ref": "pkg:github/mongodb/mongo-c-driver@1.28.0",
"externalReferences": [
{
"type": "distribution",
"url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.27.2.tar.gz"
"url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.28.0.tar.gz"
},
{
"type": "website",
"url": "https://github.com/mongodb/mongo-c-driver/tree/1.27.2"
"url": "https://github.com/mongodb/mongo-c-driver/tree/1.28.0"
}
],
"group": "mongodb",
"name": "mongo-c-driver",
"purl": "pkg:github/mongodb/mongo-c-driver@1.27.2",
"purl": "pkg:github/mongodb/mongo-c-driver@1.28.0",
"type": "library",
"version": "1.27.2"
"version": "1.28.0"
}
],
"dependencies": [
{
"ref": "pkg:github/mongodb/libmongocrypt@1.10.1"
"ref": "pkg:github/mongodb/libmongocrypt@1.11.0"
},
{
"ref": "pkg:github/mongodb/mongo-c-driver@1.27.2"
"ref": "pkg:github/mongodb/mongo-c-driver@1.28.0"
}
],
"metadata": {
"timestamp": "2024-07-03T10:31:03.600797+00:00",
"timestamp": "2024-09-20T07:58:30.627473+00:00",
"tools": [
{
"externalReferences": [
Expand Down Expand Up @@ -90,7 +90,7 @@
]
},
"serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082",
"version": 3,
"version": 4,
"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.5"
Expand Down
2 changes: 1 addition & 1 deletion src/LIBMONGOC_VERSION_CURRENT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.28.0-20240827+git1858014e01
1.28.0
2 changes: 1 addition & 1 deletion src/libmongoc
Submodule libmongoc updated 79 files
+6 −1 .evergreen/config_generator/components/c_std_compile.py
+0 −1 .evergreen/config_generator/components/cse/darwinssl.py
+0 −1 .evergreen/config_generator/components/cse/openssl.py
+0 −1 .evergreen/config_generator/components/cse/winssl.py
+31 −0 .evergreen/config_generator/components/funcs/find_cmake_latest.py
+2 −0 .evergreen/config_generator/components/loadbalanced.py
+3 −0 .evergreen/config_generator/components/make_docs.py
+2 −0 .evergreen/config_generator/components/mock_server.py
+6 −1 .evergreen/config_generator/components/openssl_static_compile.py
+1 −3 .evergreen/config_generator/components/sasl/darwinssl.py
+1 −3 .evergreen/config_generator/components/sasl/nossl.py
+1 −3 .evergreen/config_generator/components/sasl/openssl.py
+1 −3 .evergreen/config_generator/components/sasl/winssl.py
+3 −0 .evergreen/config_generator/components/scan_build.py
+2 −0 .evergreen/config_generator/etc/compile.py
+7 −1 .evergreen/config_generator/etc/utils.py
+4 −2 .evergreen/etc/mongo-c-driver.spec
+3 −0 .evergreen/etc/skip-tests.txt
+1 −1 .evergreen/etc/spec.patch
+10 −0 .evergreen/generated_configs/functions.yml
+71 −188 .evergreen/generated_configs/legacy-config.yml
+81 −0 .evergreen/generated_configs/tasks.yml
+4 −11 .evergreen/generated_configs/variants.yml
+2 −2 .evergreen/legacy_config_generator/evergreen_config_lib/functions.py
+13 −41 .evergreen/legacy_config_generator/evergreen_config_lib/tasks.py
+4 −0 .evergreen/legacy_config_generator/evergreen_config_lib/testazurekms.py
+4 −0 .evergreen/legacy_config_generator/evergreen_config_lib/testgcpkms.py
+3 −9 .evergreen/scripts/compile-libmongocrypt.sh
+12 −13 .evergreen/scripts/compile-unix.sh
+24 −33 .evergreen/scripts/compile-windows.sh
+1 −1 .evergreen/scripts/debug-core-evergreen.sh
+5 −1 .evergreen/scripts/find-ccache.sh
+1 −1 .evergreen/scripts/find-cmake-latest.sh
+1 −1 .evergreen/scripts/find-cmake-version.sh
+11 −0 .evergreen/scripts/integration-tests.sh
+2 −2 .evergreen/scripts/run-mock-server-tests.sh
+2 −2 .evergreen/scripts/run-tests-mingw.bat
+4 −4 .evergreen/scripts/run-tests.sh
+10 −0 CMakeLists.txt
+1 −1 Earthfile
+37 −2 NEWS
+1 −1 VERSION_CURRENT
+9 −2 docs/dev/earthly.rst
+4 −5 docs/dev/releasing.rst
+36 −34 poetry.lock
+1 −1 pyproject.toml
+21 −2 src/libbson/NEWS
+1 −1 src/libbson/doc/bson_utf8_escape_for_json.rst
+1 −1 src/libbson/doc/bson_utf8_get_char.rst
+11 −8 src/libbson/fuzz/CMakeLists.txt
+21 −0 src/libbson/fuzz/fuzz_test_bson_utf8_escape_for_json.c
+5 −2 src/libbson/src/bson/bson-decimal128.c
+1 −1 src/libbson/src/bson/bson-iter.c
+22 −6 src/libbson/src/bson/bson-utf8.c
+343 −295 src/libbson/tests/test-decimal128.c
+48 −5 src/libbson/tests/test-utf8.c
+1 −0 src/libmongoc/CMakeLists.txt
+ src/libmongoc/doc/includes/libbson.inv
+2 −0 src/libmongoc/doc/mongoc_client_session_start_transaction.rst
+2 −0 src/libmongoc/doc/mongoc_client_session_with_transaction.rst
+28 −0 src/libmongoc/doc/mongoc_uri_get_server_monitoring_mode.rst
+31 −0 src/libmongoc/doc/mongoc_uri_set_server_monitoring_mode.rst
+2 −0 src/libmongoc/doc/mongoc_uri_t.rst
+8 −0 src/libmongoc/src/mongoc/mongoc-log-private.h
+9 −6 src/libmongoc/src/mongoc/mongoc-log.c
+5 −0 src/libmongoc/src/mongoc/mongoc-server-monitor-private.h
+27 −3 src/libmongoc/src/mongoc/mongoc-server-monitor.c
+1 −1 src/libmongoc/src/mongoc/mongoc-stream-tls-libressl.h
+3 −0 src/libmongoc/src/mongoc/mongoc-stream-tls.c
+73 −11 src/libmongoc/src/mongoc/mongoc-uri.c
+5 −0 src/libmongoc/src/mongoc/mongoc-uri.h
+0 −9 src/libmongoc/tests/json/connection_uri/invalid-uris.json
+17 −0 src/libmongoc/tests/json/connection_uri/valid-options.json
+12 −2 src/libmongoc/tests/json/index-management/createSearchIndex.json
+12 −2 src/libmongoc/tests/json/index-management/createSearchIndexes.json
+46 −0 src/libmongoc/tests/json/uri-options/sdam-options.json
+42 −37 src/libmongoc/tests/test-mongoc-primary-stepdown.c
+236 −0 src/libmongoc/tests/test-mongoc-sdam-monitoring.c
+13 −0 src/libmongoc/tests/test-mongoc-uri.c