Skip to content

Commit 46941cd

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

File tree

11 files changed

+395
-24
lines changed

11 files changed

+395
-24
lines changed

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

Lines changed: 13 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: 13 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: 13 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: 13 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: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ tasks:
66
vars:
77
PHP_VERSION: "%phpVersion%"
88
- func: "compile extension"
9+
vars:
10+
# TODO: remove this 1.18.0 is released
11+
EXTENSION_BRANCH: "poc-phplib-1297"
12+
EXTENSION_REPO: "https://github.com/jmikola/mongo-php-driver"
913
- func: "upload extension"
1014
- name: "build-php-%phpVersion%-lowest"
1115
tags: ["build", "php%phpVersion%", "lowest"]
@@ -15,7 +19,8 @@ tasks:
1519
PHP_VERSION: "%phpVersion%"
1620
- func: "compile extension"
1721
vars:
18-
EXTENSION_VERSION: "1.17.0"
22+
EXTENSION_BRANCH: "poc-phplib-1297"
23+
EXTENSION_REPO: "https://github.com/jmikola/mongo-php-driver"
1924
- func: "upload extension"
2025
- name: "build-php-%phpVersion%-next-stable"
2126
tags: ["build", "php%phpVersion%", "next-stable"]
@@ -25,7 +30,9 @@ tasks:
2530
PHP_VERSION: "%phpVersion%"
2631
- func: "compile extension"
2732
vars:
28-
EXTENSION_BRANCH: "v1.17"
33+
# TODO: change to v1.18 once 1.18.0 is released
34+
EXTENSION_BRANCH: "poc-phplib-1297"
35+
EXTENSION_REPO: "https://github.com/jmikola/mongo-php-driver"
2936
- func: "upload extension"
3037
- name: "build-php-%phpVersion%-next-minor"
3138
tags: ["build", "php%phpVersion%", "next-minor"]
@@ -35,5 +42,8 @@ tasks:
3542
PHP_VERSION: "%phpVersion%"
3643
- func: "compile extension"
3744
vars:
38-
EXTENSION_BRANCH: "master"
45+
# TODO: change to master once PHPLIB-1297 PR is merged
46+
# EXTENSION_BRANCH: "master"
47+
EXTENSION_BRANCH: "poc-phplib-1297"
48+
EXTENSION_REPO: "https://github.com/jmikola/mongo-php-driver"
3949
- func: "upload extension"

.github/workflows/coding-standards.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ on:
1919

2020
env:
2121
PHP_VERSION: "8.2"
22-
DRIVER_VERSION: "stable"
22+
# TODO: change to mongodb/mongo-php-driver@master when merging PR
23+
DRIVER_VERSION: "jmikola/mongo-php-driver@poc-phplib-1297"
2324

2425
jobs:
2526
phpcs:

.github/workflows/static-analysis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ on:
1919

2020
env:
2121
PHP_VERSION: "8.2"
22-
DRIVER_VERSION: "stable"
22+
# TODO: change to mongodb/mongo-php-driver@master when merging PR
23+
DRIVER_VERSION: "jmikola/mongo-php-driver@poc-phplib-1297"
2324

2425
jobs:
2526
psalm:

.github/workflows/tests.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,40 @@ jobs:
3636
mongodb-version:
3737
- "4.4"
3838
driver-version:
39-
- "stable"
39+
# TODO: change to mongodb/mongo-php-driver@master when merging PR
40+
- "jmikola/mongo-php-driver@poc-phplib-1297"
4041
topology:
4142
- "server"
4243
include:
4344
- os: "ubuntu-20.04"
4445
php-version: "8.0"
4546
mongodb-version: "6.0"
46-
driver-version: "stable"
47+
# TODO: change to mongodb/mongo-php-driver@master when merging PR
48+
driver-version: "jmikola/mongo-php-driver@poc-phplib-1297"
4749
topology: "replica_set"
4850
- os: "ubuntu-20.04"
4951
php-version: "8.0"
5052
mongodb-version: "6.0"
51-
driver-version: "stable"
53+
# TODO: change to mongodb/mongo-php-driver@master when merging PR
54+
driver-version: "jmikola/mongo-php-driver@poc-phplib-1297"
5255
topology: "sharded_cluster"
5356
- os: "ubuntu-20.04"
5457
php-version: "8.0"
5558
mongodb-version: "5.0"
56-
driver-version: "stable"
59+
# TODO: change to mongodb/mongo-php-driver@master when merging PR
60+
driver-version: "jmikola/mongo-php-driver@poc-phplib-1297"
5761
topology: "server"
5862
- os: "ubuntu-20.04"
5963
php-version: "8.0"
6064
mongodb-version: "4.4"
61-
driver-version: "stable"
65+
d# TODO: change to mongodb/mongo-php-driver@master when merging PR
66+
driver-version: "jmikola/mongo-php-driver@poc-phplib-1297"
6267
topology: "replica_set"
6368
- os: "ubuntu-20.04"
6469
php-version: "8.0"
6570
mongodb-version: "4.4"
66-
driver-version: "stable"
71+
# TODO: change to mongodb/mongo-php-driver@master when merging PR
72+
driver-version: "jmikola/mongo-php-driver@poc-phplib-1297"
6773
topology: "sharded_cluster"
6874

6975
steps:

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)