Skip to content

Update libmongoc to 1.17.0-dev #1098

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Update libmongoc to 1.17.0-dev #1098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,10 +680,11 @@ axes:
- id: libmongoc-version
display_name: libmongoc version
values:
- id: "1.16-latest"
display_name: "1.16 latest"
variables:
LIBMONGOC_VERSION: "r1.16"
# Todo: re-enable once 1.17 is branches
Copy link
Member

Choose a reason for hiding this comment

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

"is branched"

Also, perhaps you want to pre-emptively update the references to "1.16" below?

# - id: "1.16-latest"
# display_name: "1.16 latest"
# variables:
# LIBMONGOC_VERSION: "r1.16"
- id: "master"
display_name: "Upcoming release (master)"
variables:
Expand Down
8 changes: 4 additions & 4 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,13 @@ if test "$PHP_MONGODB" != "no"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
AC_MSG_CHECKING(for libbson)
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libbson-1.0; then
if $PKG_CONFIG libbson-1.0 --atleast-version 1.16.1; then
if $PKG_CONFIG libbson-1.0 --atleast-version 1.17.0; then
PHP_MONGODB_BSON_CFLAGS=`$PKG_CONFIG libbson-1.0 --cflags`
PHP_MONGODB_BSON_LIBS=`$PKG_CONFIG libbson-1.0 --libs`
PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
AC_MSG_RESULT(version $PHP_MONGODB_BSON_VERSION found)
else
AC_MSG_ERROR(system libbson must be upgraded to version >= 1.16.1)
AC_MSG_ERROR(system libbson must be upgraded to version >= 1.17.0)
fi
else
AC_MSG_ERROR(pkgconfig and libbson must be installed)
Expand All @@ -237,13 +237,13 @@ if test "$PHP_MONGODB" != "no"; then

AC_MSG_CHECKING(for libmongoc)
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongoc-1.0; then
if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.16.1; then
if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.17.0; then
PHP_MONGODB_MONGOC_CFLAGS=`$PKG_CONFIG libmongoc-1.0 --cflags`
PHP_MONGODB_MONGOC_LIBS=`$PKG_CONFIG libmongoc-1.0 --libs`
PHP_MONGODB_MONGOC_VERSION=`$PKG_CONFIG libmongoc-1.0 --modversion`
AC_MSG_RESULT(version $PHP_MONGODB_MONGOC_VERSION found)
else
AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.16.1)
AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.17.0)
fi
else
AC_MSG_ERROR(pkgconfig and libmongoc must be installed)
Expand Down
2 changes: 1 addition & 1 deletion src/LIBMONGOC_VERSION_CURRENT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.16.1
1.17.0-20200207+git7e801593f2
2 changes: 1 addition & 1 deletion src/libmongoc
Open in desktop
Submodule libmongoc updated 20 files
+4 −0 .evergreen/compile-unix.sh
+10 −10 .evergreen/config.yml
+35 −0 NEWS
+10 −10 build/evergreen_config_lib/variants.py
+1 −1 debian/control
+2 −2 debian/gbp.conf
+19 −2 src/libbson/NEWS
+2 −2 src/libmongoc/doc/includes/change-stream-opts.txt
+ − src/libmongoc/doc/libbson-objects.inv
+6 −0 src/libmongoc/doc/mongoc_client_destroy.rst
+2 −0 src/libmongoc/doc/mongoc_client_pool_destroy.rst
+3 −1 src/libmongoc/doc/mongoc_client_pool_pop.rst
+1 −1 src/libmongoc/doc/mongoc_collection_find_with_opts.rst
+0 −5 src/libmongoc/examples/example-client.c
+3 −1 src/libmongoc/src/mongoc/mongoc-client-private.h
+7 −0 src/libmongoc/src/mongoc/mongoc-cluster.c
+1 −0 src/libmongoc/tests/test-libmongoc.c
+1 −0 src/libmongoc/tests/test-libmongoc.h
+54 −0 src/libmongoc/tests/test-mongoc-client-pool.c
+155 −0 src/libmongoc/tests/test-mongoc-client-side-encryption.c