Skip to content

Merge v2.3 into v2.x#2013

Merged
mongodb-drivers-pr-bot[bot] merged 3 commits intov2.xfrom
merge-v2.3-into-v2.x-1777888321335
May 4, 2026
Merged

Merge v2.3 into v2.x#2013
mongodb-drivers-pr-bot[bot] merged 3 commits intov2.xfrom
merge-v2.3-into-v2.x-1777888321335

Conversation

@mongodb-drivers-pr-bot
Copy link
Copy Markdown
Contributor

Merge new changes from v2.3 into v2.x.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge v2.x -m "Resolve conflicts in v2.x"

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:
git reset --hard v2.x
git merge --strategy=ours v2.3 -m "Ignore changes from v2.3"

Then, push the temporary branch to upate the pull request.

GromNaN and others added 2 commits May 4, 2026 09:07
…2011)

PHP 8.6 removed XtOffsetOf from php_stdint.h, so use the standard offsetof macro for object fetch helpers.

Co-authored-by: Andy Postnikov <apostnikov@gmail.com>
* Add CI job to verify out-of-source builds

Runs phpize in the extension source directory, then invokes configure
and make from a separate build directory. This catches regressions where
generated headers are placed relative to $PWD rather than the extension
source (PHP_EXT_SRCDIR), which breaks any build where configure is not
run from within the extension directory.

* Use PHP 8.5 for static PHP build

* PHPC-2715: fix out-of-sources-tree builds

* Allow installing libmongocrypt 1.18 for system libraries test

---------

Co-authored-by: Remi Collet <remi@remirepo.net>
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot Bot enabled auto-merge May 4, 2026 09:52
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot Bot requested a review from a team as a code owner May 4, 2026 09:52
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot Bot requested review from GromNaN and removed request for a team May 4, 2026 09:52
@GromNaN GromNaN mentioned this pull request May 4, 2026
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot Bot merged commit ccf9747 into v2.x May 4, 2026
45 checks passed
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot Bot deleted the merge-v2.3-into-v2.x-1777888321335 branch May 4, 2026 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants