Skip to content

Commit 3305732

Browse files
mongodb-php-botmongodb-php-bot
authored
Merge v1.x into v2.x (#1731)
2 parents 450fd1c + 9afa132 commit 3305732

File tree

12 files changed

+99
-99
lines changed

12 files changed

+99
-99
lines changed

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

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

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

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

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

‎.evergreen/config/generated/test-variant/libmongoc.yml

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

‎.evergreen/config/generated/test-variant/php-full.yml

Lines changed: 0 additions & 4 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: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
- func: "compile driver"
1111
vars:
1212
PHP_VERSION: "%phpVersion%"
13-
LIBMONGOC_VERSION: "1.28.0"
13+
LIBMONGOC_VERSION: "1.28.1"
1414
- func: "upload build"
1515

1616
- name: "build-php-%phpVersion%-libmongoc-next-stable"
@@ -22,11 +22,13 @@
2222
LIBMONGOC_VERSION: "r1.28"
2323
- func: "upload build"
2424

25-
- name: "build-php-%phpVersion%-libmongoc-latest"
26-
tags: ["build-libmongoc", "php%phpVersion%"]
27-
commands:
28-
- func: "compile driver"
29-
vars:
30-
PHP_VERSION: "%phpVersion%"
31-
LIBMONGOC_VERSION: "master"
32-
- func: "upload build"
25+
# TODO: this currently fails as libmongoc master needs changes to build directories
26+
# We can re-enable this after switching to 1.29-dev
27+
# - name: "build-php-%phpVersion%-libmongoc-latest"
28+
# tags: ["build-libmongoc", "php%phpVersion%"]
29+
# commands:
30+
# - func: "compile driver"
31+
# vars:
32+
# PHP_VERSION: "%phpVersion%"
33+
# LIBMONGOC_VERSION: "master"
34+
# - func: "upload build"

‎.evergreen/config/templates/test-variant/libmongoc.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -61,33 +61,33 @@
6161
execution_tasks:
6262
- ".ocsp .7.0"
6363

64-
- name: test-debian12-php-%phpVersion%-libmongoc-latest
65-
tags: ["test", "libmongoc", "debian", "x64", "php%phpVersion%"]
66-
display_name: "Test: Debian 12, PHP %phpVersion%, libmongoc latest"
67-
run_on: debian12-small
68-
expansions:
69-
FETCH_BUILD_VARIANT: "build-debian12"
70-
FETCH_BUILD_TASK: "build-php-%phpVersion%-libmongoc-latest"
71-
depends_on:
72-
- variant: "build-debian12"
73-
name: "build-php-%phpVersion%-libmongoc-latest"
74-
tasks:
75-
- ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
76-
- ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
77-
- ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
78-
- ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
79-
- "test-atlas-connectivity"
80-
- ".ocsp !.4.4 !.5.0 !.6.0"
81-
display_tasks:
82-
- name: "test-ocsp-latest"
83-
execution_tasks:
84-
- ".ocsp .latest"
85-
- name: "test-ocsp-rapid"
86-
execution_tasks:
87-
- ".ocsp .rapid"
88-
- name: "test-ocsp-8.0"
89-
execution_tasks:
90-
- ".ocsp .8.0"
91-
- name: "test-ocsp-7.0"
92-
execution_tasks:
93-
- ".ocsp .7.0"
64+
# - name: test-debian12-php-%phpVersion%-libmongoc-latest
65+
# tags: ["test", "libmongoc", "debian", "x64", "php%phpVersion%"]
66+
# display_name: "Test: Debian 12, PHP %phpVersion%, libmongoc latest"
67+
# run_on: debian12-small
68+
# expansions:
69+
# FETCH_BUILD_VARIANT: "build-debian12"
70+
# FETCH_BUILD_TASK: "build-php-%phpVersion%-libmongoc-latest"
71+
# depends_on:
72+
# - variant: "build-debian12"
73+
# name: "build-php-%phpVersion%-libmongoc-latest"
74+
# tasks:
75+
# - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
76+
# - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
77+
# - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
78+
# - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0"
79+
# - "test-atlas-connectivity"
80+
# - ".ocsp !.4.4 !.5.0 !.6.0"
81+
# display_tasks:
82+
# - name: "test-ocsp-latest"
83+
# execution_tasks:
84+
# - ".ocsp .latest"
85+
# - name: "test-ocsp-rapid"
86+
# execution_tasks:
87+
# - ".ocsp .rapid"
88+
# - name: "test-ocsp-8.0"
89+
# execution_tasks:
90+
# - ".ocsp .8.0"
91+
# - name: "test-ocsp-7.0"
92+
# execution_tasks:
93+
# - ".ocsp .7.0"

‎.evergreen/config/templates/test-variant/php-full.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
- ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
7373
- ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
7474
- ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
75-
- ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
7675
- ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest"
7776
display_tasks:
7877
- name: "test-ocsp-4.4"

‎.github/actions/windows/prepare-build/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ runs:
1919
steps:
2020
- name: Setup PHP SDK
2121
id: setup-php
22-
uses: php/setup-php-sdk@v0.9
22+
uses: php/setup-php-sdk@v0.10
2323
with:
2424
version: ${{ inputs.version }}
2525
arch: ${{ inputs.arch }}
2626
ts: ${{ inputs.ts }}
2727
deps: openssl
28+
cache: true
2829

2930
- name: Enable Developer Command Prompt
3031
uses: ilammy/msvc-dev-cmd@v1

‎config.m4

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

238238
if test "$PHP_MONGODB_SYSTEM_LIBS" != "no"; then
239-
PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.28.0], [
239+
PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.28.1], [
240240
PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
241241
PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
242242
243243
PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_BSON_CFLAGS"
244244
PHP_EVAL_LIBLINE($PHP_MONGODB_BSON_LIBS, MONGODB_SHARED_LIBADD)
245245
AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson])
246246
],[
247-
AC_MSG_ERROR([Could not find system library for libbson >= 1.28.0])
247+
AC_MSG_ERROR([Could not find system library for libbson >= 1.28.1])
248248
])
249249

250-
PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.28.0], [
250+
PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.28.1], [
251251
PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
252252
PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
253253
254254
PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_MONGOC_CFLAGS"
255255
PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOC_LIBS, MONGODB_SHARED_LIBADD)
256256
AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc])
257257
],[
258-
AC_MSG_ERROR(Could not find system library for libmongoc >= 1.28.0)
258+
AC_MSG_ERROR(Could not find system library for libmongoc >= 1.28.1)
259259
])
260260

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

‎sbom.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,34 @@
1919
"version": "1.11.0"
2020
},
2121
{
22-
"bom-ref": "pkg:github/mongodb/mongo-c-driver@1.28.0",
22+
"bom-ref": "pkg:github/mongodb/mongo-c-driver@1.28.1",
2323
"externalReferences": [
2424
{
2525
"type": "distribution",
26-
"url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.28.0.tar.gz"
26+
"url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.28.1.tar.gz"
2727
},
2828
{
2929
"type": "website",
30-
"url": "https://github.com/mongodb/mongo-c-driver/tree/1.28.0"
30+
"url": "https://github.com/mongodb/mongo-c-driver/tree/1.28.1"
3131
}
3232
],
3333
"group": "mongodb",
3434
"name": "mongo-c-driver",
35-
"purl": "pkg:github/mongodb/mongo-c-driver@1.28.0",
35+
"purl": "pkg:github/mongodb/mongo-c-driver@1.28.1",
3636
"type": "library",
37-
"version": "1.28.0"
37+
"version": "1.28.1"
3838
}
3939
],
4040
"dependencies": [
4141
{
4242
"ref": "pkg:github/mongodb/libmongocrypt@1.11.0"
4343
},
4444
{
45-
"ref": "pkg:github/mongodb/mongo-c-driver@1.28.0"
45+
"ref": "pkg:github/mongodb/mongo-c-driver@1.28.1"
4646
}
4747
],
4848
"metadata": {
49-
"timestamp": "2024-09-20T07:58:30.627473+00:00",
49+
"timestamp": "2024-10-16T08:27:04.343416+00:00",
5050
"tools": [
5151
{
5252
"externalReferences": [
@@ -90,7 +90,7 @@
9090
]
9191
},
9292
"serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082",
93-
"version": 4,
93+
"version": 5,
9494
"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
9595
"bomFormat": "CycloneDX",
9696
"specVersion": "1.5"

‎src/LIBMONGOC_VERSION_CURRENT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.28.0
1+
1.28.1

‎src/libmongoc

Submodule libmongoc updated 28 files

0 commit comments

Comments
 (0)