PHPC-2702 PHPC-2698 Upgrade libmongoc to 2.3.0 and libmongocrypt to 1.17.3#1994
PHPC-2702 PHPC-2698 Upgrade libmongoc to 2.3.0 and libmongocrypt to 1.17.3#1994GromNaN wants to merge 5 commits intomongodb:v2.xfrom
Conversation
There was a problem hiding this comment.
Pull request overview
Updates the PHP MongoDB extension’s build configuration to target libmongoc/libbson 2.3.0, aligning both system-library checks and bundled-source compilation with the new upstream driver release.
Changes:
- Bump
pkg-configminimum versions for systembson2/mongoc2from 2.2.2 to 2.3.0. - Update bundled libmongoc source file lists to match new/removed compilation units for 2.3.0 (e.g., add retry/backoff and jitter sources; drop deprecated cursor cmd unit).
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| config.w32 | Updates Windows build source list for bundled libmongoc to match 2.3.0 changes. |
| config.m4 | Raises system-library minimum versions to 2.3.0 and updates bundled libmongoc source list accordingly. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 6 out of 7 changed files in this pull request and generated 3 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
alcaeus
left a comment
There was a problem hiding this comment.
Changes LGTM. Happy to defer the env change in GitHub Actions workflows to a separate PR.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 7 out of 8 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.17.3], [ | ||
| PHP_MONGODB_MONGOCRYPT_VERSION=`$PKG_CONFIG libmongocrypt --modversion` | ||
| PHP_MONGODB_MONGOCRYPT_VERSION_STRING="System ($PHP_MONGODB_MONGOCRYPT_VERSION)" | ||
|
|
||
| PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_MONGOCRYPT_CFLAGS" | ||
| PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOCRYPT_LIBS, MONGODB_SHARED_LIBADD) | ||
| AC_DEFINE(HAVE_SYSTEM_LIBMONGOCRYPT, 1, [Use system libmongocrypt]) | ||
| ],[ | ||
| AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.17.2) | ||
| AC_MSG_ERROR([Could not find system library for libmongocrypt >= 1.17.3]) |
There was a problem hiding this comment.
The minimum required system libmongocrypt version was bumped to 1.17.3 here, but the repo’s tracked bundled libmongocrypt version (src/LIBMONGOCRYPT_VERSION_CURRENT) and the SBOM still indicate 1.17.2. If 1.17.3 is required for the libmongoc 2.3.0 upgrade, please also bump the bundled version tracking (and regenerate sbom.json); otherwise keep the system-libs minimum at 1.17.2 to avoid unnecessarily breaking builds against distro-provided libmongocrypt 1.17.2.
| echo "pkg:github/mongodb/libmongocrypt@${LIBMONGOCRYPT_VERSION}" >> $PURLS_FILE | ||
|
|
||
| # Use silkbomb to update the sbom.json file | ||
| docker run --platform="linux/amd64" -it --rm -v ${ROOT_DIR}:/pwd \ |
There was a problem hiding this comment.
-t requires a TTY, which is not available when running from a non-interactive shell (e.g. Claude Code's Bash tool). Using -i alone is sufficient for stdin.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 11 out of 12 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
The |
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 12 out of 13 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Close PHPC-2702
Close PHPC-2698
Upgrade libmongoc to 2.3.0 and libmongocrypt to 1.17.3.