Skip to content

Commit f5ca213

Browse files
Merge v1.20 into v1.x (#1674)
2 parents 637ea48 + e9c6e0d commit f5ca213

File tree

5 files changed

+20
-24
lines changed

5 files changed

+20
-24
lines changed

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

Lines changed: 2 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: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
- func: "compile driver"
1111
vars:
1212
PHP_VERSION: "%phpVersion%"
13-
# TODO: Change to "1.28.0" once 1.28.0 is released
14-
LIBMONGOC_VERSION: "master"
13+
LIBMONGOC_VERSION: "1.28.0"
1514
- func: "upload build"
1615

1716
- name: "build-php-%phpVersion%-libmongoc-next-stable"
@@ -20,8 +19,7 @@
2019
- func: "compile driver"
2120
vars:
2221
PHP_VERSION: "%phpVersion%"
23-
# TODO: Change to "r1.28" once 1.28.0 is released
24-
LIBMONGOC_VERSION: "master"
22+
LIBMONGOC_VERSION: "r1.28"
2523
- func: "upload build"
2624

2725
- name: "build-php-%phpVersion%-libmongoc-latest"

sbom.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
{
22
"components": [
33
{
4-
"bom-ref": "pkg:github/mongodb/libmongocrypt@1.10.1",
4+
"bom-ref": "pkg:github/mongodb/libmongocrypt@1.11.0",
55
"externalReferences": [
66
{
77
"type": "distribution",
8-
"url": "https://github.com/mongodb/libmongocrypt/archive/refs/tags/1.10.1.tar.gz"
8+
"url": "https://github.com/mongodb/libmongocrypt/archive/refs/tags/1.11.0.tar.gz"
99
},
1010
{
1111
"type": "website",
12-
"url": "https://github.com/mongodb/libmongocrypt/tree/1.10.1"
12+
"url": "https://github.com/mongodb/libmongocrypt/tree/1.11.0"
1313
}
1414
],
1515
"group": "mongodb",
1616
"name": "libmongocrypt",
17-
"purl": "pkg:github/mongodb/libmongocrypt@1.10.1",
17+
"purl": "pkg:github/mongodb/libmongocrypt@1.11.0",
1818
"type": "library",
19-
"version": "1.10.1"
19+
"version": "1.11.0"
2020
},
2121
{
22-
"bom-ref": "pkg:github/mongodb/mongo-c-driver@1.27.2",
22+
"bom-ref": "pkg:github/mongodb/mongo-c-driver@1.28.0",
2323
"externalReferences": [
2424
{
2525
"type": "distribution",
26-
"url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.27.2.tar.gz"
26+
"url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.28.0.tar.gz"
2727
},
2828
{
2929
"type": "website",
30-
"url": "https://github.com/mongodb/mongo-c-driver/tree/1.27.2"
30+
"url": "https://github.com/mongodb/mongo-c-driver/tree/1.28.0"
3131
}
3232
],
3333
"group": "mongodb",
3434
"name": "mongo-c-driver",
35-
"purl": "pkg:github/mongodb/mongo-c-driver@1.27.2",
35+
"purl": "pkg:github/mongodb/mongo-c-driver@1.28.0",
3636
"type": "library",
37-
"version": "1.27.2"
37+
"version": "1.28.0"
3838
}
3939
],
4040
"dependencies": [
4141
{
42-
"ref": "pkg:github/mongodb/libmongocrypt@1.10.1"
42+
"ref": "pkg:github/mongodb/libmongocrypt@1.11.0"
4343
},
4444
{
45-
"ref": "pkg:github/mongodb/mongo-c-driver@1.27.2"
45+
"ref": "pkg:github/mongodb/mongo-c-driver@1.28.0"
4646
}
4747
],
4848
"metadata": {
49-
"timestamp": "2024-07-03T10:31:03.600797+00:00",
49+
"timestamp": "2024-09-20T07:58:30.627473+00:00",
5050
"tools": [
5151
{
5252
"externalReferences": [
@@ -90,7 +90,7 @@
9090
]
9191
},
9292
"serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082",
93-
"version": 3,
93+
"version": 4,
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-20240827+git1858014e01
1+
1.28.0

src/libmongoc

Submodule libmongoc updated 79 files

0 commit comments

Comments
 (0)