Merge v2.1 into v2.x #1884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

mongodb-php-bot merged 4 commits into v2.x from merge-v2.1-into-v2.x-1759848868762

Oct 7, 2025

Merged

Merge v2.1 into v2.x #1884

mongodb-php-bot merged 4 commits into v2.x from merge-v2.1-into-v2.x-1759848868762

Oct 7, 2025

Conversation

@mongodb-php-bot

Copy link

Collaborator

@mongodb-php-bot mongodb-php-bot commented Oct 7, 2025

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

Commits

Merge branch 'v1.21' into v2.1: beaf460
Back to -dev: 06c0857
Package 1.21.2: d628610
PHPC-2637: Update to libmongoc 1.30.6 (PHPC-2637: Update to libmongoc 1.30.6 #1882 ): fa5b433

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:

git merge 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.1

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

alcaeus and others added 4 commits

October 7, 2025 10:37

@alcaeus


 PHPC-2637 : Update to libmongoc 1.30.6 ( #1882 )

fa5b433

@mongodb-dbx-release-bot


 Package 1.21.2

d628610

Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>

@mongodb-dbx-release-bot


 Back to -dev

06c0857

Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>

@mongodb-dbx-release-bot


 Merge branch 'v1.21' into v2.1

beaf460

@mongodb-php-bot mongodb-php-bot enabled auto-merge

October 7, 2025 14:54

jmikola

jmikola approved these changes

Oct 7, 2025

View reviewed changes

@mongodb-php-bot mongodb-php-bot merged commit 6dbe9d7 into v2.x

Oct 7, 2025

132 checks passed

@mongodb-php-bot mongodb-php-bot deleted the merge-v2.1-into-v2.x-1759848868762 branch

October 7, 2025 15:16

@codecov-commenter

Copy link

codecov-commenter commented Oct 7, 2025

❌ 1 Tests Failed:

Tests completed	Failed	Passed	Skipped
4006	1	4005	422

View the top 1 failed test(s) by shortest run time

::tests/manager/manager-executeCommand_error-003.phpt (MongoDB\Driver\Manager::executeCommand() connection error)

Stack Traces | 0.0187s run time

001- OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
002- No suitable servers found (`serverSelectionTryOnce` set): %s
003- ===DONE===
001+ .../src/mongoc/mongoc-rpc.c:429 mcd_rpc_message_ingress(): Unreachable code reached: unexpected OP_QUERY ingress
002+ Aborted
003+ 
004+ Termsig=6

To view more test analytics, go to the Test Analytics Dashboard
_{📋 Got 3 mins? Take this short survey to help us improve Test Analytics.}