Skip to content

Commit 28b5a41

Browse files
alcaeusjmikola
alcaeus
and
jmikola
authored
PHPC-2319: Bump to libmongoc 1.25.1 (#1487)
* Bump to libmongoc 1.25.1 * Enable builds for stable and lowest libmongoc versions * Apply suggestions from code review Co-authored-by: Jeremy Mikola <[email protected]> --------- Co-authored-by: Jeremy Mikola <[email protected]>
1 parent 74e47d8 commit 28b5a41

File tree

7 files changed

+65
-66
lines changed

7 files changed

+65
-66
lines changed

‎.evergreen/config/build-task-groups.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ task_groups:
3333

3434
- name: "build-php-libmongoc"
3535
# Keep this in sync with the actual number of libmongoc builds (typically 3) defined in _template-build-libmongoc.yml
36-
max_hosts: 1
36+
max_hosts: 3
3737
setup_task: *build_setup
3838
setup_task_can_fail_task: true
3939
setup_task_timeout_secs: 1800

‎.evergreen/config/generated/build/build-libmongoc-8.2.yml

Lines changed: 16 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.evergreen/config/templates/build/build-libmongoc.yml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,23 @@
55
# where the "max_hosts" setting must be set to the number of enabled tasks.
66
# Last but not least, make sure the corresponding test variants are enabled in .evergreen/config/test-variants.yml
77
tasks:
8-
# TODO: Enable the following two builds once libmongoc 1.25.0 is released
9-
# - name: "build-php-%phpVersion%-libmongoc-lowest-supported"
10-
# tags: ["build-libmongoc", "php%phpVersion%"]
11-
# commands:
12-
# - func: "compile driver"
13-
# vars:
14-
# PHP_VERSION: "%phpVersion%"
15-
# LIBMONGOC_VERSION: "1.25.0"
16-
# - func: "upload build"
8+
- name: "build-php-%phpVersion%-libmongoc-lowest-supported"
9+
tags: ["build-libmongoc", "php%phpVersion%"]
10+
commands:
11+
- func: "compile driver"
12+
vars:
13+
PHP_VERSION: "%phpVersion%"
14+
LIBMONGOC_VERSION: "1.25.1"
15+
- func: "upload build"
1716

18-
# - name: "build-php-%phpVersion%-libmongoc-next-stable"
19-
# tags: ["build-libmongoc", "php%phpVersion%"]
20-
# commands:
21-
# - func: "compile driver"
22-
# vars:
23-
# PHP_VERSION: "%phpVersion%"
24-
# LIBMONGOC_VERSION: "r1.25"
25-
# - func: "upload build"
17+
- name: "build-php-%phpVersion%-libmongoc-next-stable"
18+
tags: ["build-libmongoc", "php%phpVersion%"]
19+
commands:
20+
- func: "compile driver"
21+
vars:
22+
PHP_VERSION: "%phpVersion%"
23+
LIBMONGOC_VERSION: "r1.25"
24+
- func: "upload build"
2625

2726
- name: "build-php-%phpVersion%-libmongoc-latest"
2827
tags: ["build-libmongoc", "php%phpVersion%"]

‎.evergreen/config/test-variants.yml

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -97,31 +97,32 @@ buildvariants:
9797
- ".replicaset .local .7.0 .auth"
9898

9999
# Variants with different libmongoc
100-
# TODO: Enable the following two builds once libmongoc 1.25.0 is released
101-
# - name: test-debian11-php82-local-libmongoc-lowest-supported
102-
# display_name: "Test: Debian 11, PHP 8.2, libmongoc lowest"
103-
# tags: ["test", "libmongoc", "debian", "x64"]
104-
# run_on: debian11-small
105-
# expansions:
106-
# FETCH_BUILD_VARIANT: "build-debian11"
107-
# FETCH_BUILD_TASK: "build-php-8.2-libmongoc-lowest-supported"
108-
# depends_on:
109-
# - variant: "build-debian11"
110-
# name: "build-php-8.2-libmongoc-lowest-supported"
111-
# tasks:
112-
# - ".replicaset .local .7.0 .auth"
113-
# - name: test-debian11-php82-local-libmongoc-next-stable
114-
# display_name: "Test: Debian 11, PHP 8.2, libmongoc next stable"
115-
# tags: ["test", "libmongoc", "debian", "x64"]
116-
# run_on: debian11-small
117-
# expansions:
118-
# FETCH_BUILD_VARIANT: "build-debian11"
119-
# FETCH_BUILD_TASK: "build-php-8.2-libmongoc-next-stable"
120-
# depends_on:
121-
# - variant: "build-debian11"
122-
# name: "build-php-8.2-libmongoc-next-stable"
123-
# tasks:
124-
# - ".replicaset .local .7.0 .auth"
100+
- name: test-debian11-php82-local-libmongoc-lowest-supported
101+
display_name: "Test: Debian 11, PHP 8.2, libmongoc lowest"
102+
tags: ["test", "libmongoc", "debian", "x64"]
103+
run_on: debian11-small
104+
expansions:
105+
FETCH_BUILD_VARIANT: "build-debian11"
106+
FETCH_BUILD_TASK: "build-php-8.2-libmongoc-lowest-supported"
107+
depends_on:
108+
- variant: "build-debian11"
109+
name: "build-php-8.2-libmongoc-lowest-supported"
110+
tasks:
111+
- ".replicaset .local .7.0 .auth"
112+
113+
- name: test-debian11-php82-local-libmongoc-next-stable
114+
display_name: "Test: Debian 11, PHP 8.2, libmongoc next stable"
115+
tags: ["test", "libmongoc", "debian", "x64"]
116+
run_on: debian11-small
117+
expansions:
118+
FETCH_BUILD_VARIANT: "build-debian11"
119+
FETCH_BUILD_TASK: "build-php-8.2-libmongoc-next-stable"
120+
depends_on:
121+
- variant: "build-debian11"
122+
name: "build-php-8.2-libmongoc-next-stable"
123+
tasks:
124+
- ".replicaset .local .7.0 .auth"
125+
125126
- name: test-debian11-php82-local-libmongoc-latest
126127
tags: ["test", "libmongoc", "debian", "x64"]
127128
display_name: "Test: Debian 11, PHP 8.2, libmongoc latest"

‎config.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,26 +270,26 @@ if test "$PHP_MONGODB" != "no"; then
270270
PHP_MONGODB_MONGOCRYPT_VERSION_STRING="None"
271271

272272
if test "$PHP_MONGODB_SYSTEM_LIBS" != "no"; then
273-
PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.25.0], [
273+
PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.25.1], [
274274
PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
275275
PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
276276
277277
PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_BSON_CFLAGS"
278278
PHP_EVAL_LIBLINE($PHP_MONGODB_BSON_LIBS, MONGODB_SHARED_LIBADD)
279279
AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson])
280280
],[
281-
AC_MSG_ERROR([Could not find system library for libbson >= 1.25.0])
281+
AC_MSG_ERROR([Could not find system library for libbson >= 1.25.1])
282282
])
283283

284-
PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.25.0], [
284+
PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.25.1], [
285285
PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
286286
PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
287287
288288
PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_MONGOC_CFLAGS"
289289
PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOC_LIBS, MONGODB_SHARED_LIBADD)
290290
AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc])
291291
],[
292-
AC_MSG_ERROR(Could not find system library for libmongoc >= 1.25.0)
292+
AC_MSG_ERROR(Could not find system library for libmongoc >= 1.25.1)
293293
])
294294

295295
if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then

‎src/LIBMONGOC_VERSION_CURRENT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.25.0
1+
1.25.1

‎src/libmongoc

0 commit comments

Comments
 (0)