Merge v2.1 into v2.x #1888

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 2 commits into v2.x from merge-v2.1-into-v2.x-1759928244715

Oct 8, 2025

Merged

Merge v2.1 into v2.x #1888

mongodb-php-bot merged 2 commits into v2.x from merge-v2.1-into-v2.x-1759928244715

Oct 8, 2025

Conversation

@mongodb-php-bot

Copy link

Collaborator

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

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

Commits

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

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


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

7bc80b7

@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner

October 8, 2025 12:57

@mongodb-php-bot mongodb-php-bot requested review from paulinevos and removed request for a team

October 8, 2025 12:57

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

October 8, 2025 12:57

@jmikola


 Merge branch 'v2.1' into merge-v2.1-into-v2.x-1759928244715

@jmikola

Copy link

Member

jmikola commented Oct 8, 2025

Going to ignore changes here, as PHPC v2.x is already on libmongoc 2.0.x.

The fix in 1.30.6 was also merged up to 2.1.2; however, the bump to libmongoc 2.1.x is currently blocked on some Windows build failures. I'll merge this without pulling in changes and then revise #1868 to libmongoc 2.1.2 and focus efforts on addressing those build failures so we can get the fix into PHPC v2.x ASAP.