Skip to content

Commit d45acaf

Browse files
committed
wip PHPLIB-1297: pre-4.4 mongos writeConcernError does not determine retryability
Synced with mongodb/specifications@3e60a7c
1 parent 92e0a10 commit d45acaf

File tree

8 files changed

+359
-16
lines changed

8 files changed

+359
-16
lines changed

.evergreen/config/generated/build/build-php-7.4.yml

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/build/build-php-8.0.yml

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/build/build-php-8.1.yml

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/build/build-php-8.2.yml

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/templates/build/build-extension.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ tasks:
1515
PHP_VERSION: "%phpVersion%"
1616
- func: "compile extension"
1717
vars:
18-
EXTENSION_VERSION: "1.17.0"
18+
EXTENSION_BRANCH: "poc-phplib-1297"
19+
EXTENSION_REPO: "https://github.com/jmikola/mongo-php-driver"
1920
- func: "upload extension"
2021
- name: "build-php-%phpVersion%-next-stable"
2122
tags: ["build", "php%phpVersion%", "next-stable"]
@@ -25,7 +26,9 @@ tasks:
2526
PHP_VERSION: "%phpVersion%"
2627
- func: "compile extension"
2728
vars:
28-
EXTENSION_BRANCH: "v1.17"
29+
# TODO: change to v1.18 once 1.18.0 is released
30+
EXTENSION_BRANCH: "poc-phplib-1297"
31+
EXTENSION_REPO: "https://github.com/jmikola/mongo-php-driver"
2932
- func: "upload extension"
3033
- name: "build-php-%phpVersion%-next-minor"
3134
tags: ["build", "php%phpVersion%", "next-minor"]
@@ -35,5 +38,8 @@ tasks:
3538
PHP_VERSION: "%phpVersion%"
3639
- func: "compile extension"
3740
vars:
38-
EXTENSION_BRANCH: "master"
41+
# TODO: change to master once PHPLIB-1297 PR is merged
42+
# EXTENSION_BRANCH: "master"
43+
EXTENSION_BRANCH: "poc-phplib-1297"
44+
EXTENSION_REPO: "https://github.com/jmikola/mongo-php-driver"
3945
- func: "upload extension"

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"php": "^7.4 || ^8.0",
1414
"ext-hash": "*",
1515
"ext-json": "*",
16-
"ext-mongodb": "^1.17.0",
16+
"ext-mongodb": "^1.18.0",
1717
"jean85/pretty-package-versions": "^2.0.1",
1818
"psr/log": "^1.1.4|^2|^3",
1919
"symfony/polyfill-php80": "^1.27",

tests/UnifiedSpecTests/retryable-writes/bulkWrite-serverErrors.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
"tests": [
6060
{
6161
"description": "BulkWrite succeeds after retryable writeConcernError in first batch",
62+
"runOnRequirements": [
63+
{
64+
"minServerVersion": "4.3.1"
65+
}
66+
],
6267
"operations": [
6368
{
6469
"name": "failPoint",

0 commit comments

Comments
 (0)