Skip to content

Commit b9dd04f

Browse files
authored
PHPLIB-1297: pre-4.4 mongos writeConcernError does not determine retryability (#1221)
Synced with mongodb/specifications@3e60a7c A DRIVER_VERSION env var was added to the tests.yml GitHub workflow to reduce duplication. * Use lowercase name to access env context var
1 parent 216b0b3 commit b9dd04f

File tree

11 files changed

+377
-23
lines changed

11 files changed

+377
-23
lines changed

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

+9-2
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

+9-2
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

+9-2
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

+9-2
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.3.yml

+9-2
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

+9-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ 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: "master"
912
- func: "upload extension"
1013
- name: "build-php-%phpVersion%-lowest"
1114
tags: ["build", "php%phpVersion%", "lowest"]
@@ -15,7 +18,9 @@ tasks:
1518
PHP_VERSION: "%phpVersion%"
1619
- func: "compile extension"
1720
vars:
18-
EXTENSION_VERSION: "1.17.0"
21+
# TODO: change to "1.18.0" once 1.18.0 is released
22+
# EXTENSION_VERSION: "1.18.0"
23+
EXTENSION_BRANCH: "master"
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_VERSION: "v1.18"
35+
EXTENSION_BRANCH: "master"
2936
- func: "upload extension"
3037
- name: "build-php-%phpVersion%-next-minor"
3138
tags: ["build", "php%phpVersion%", "next-minor"]

.github/workflows/coding-standards.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ on:
1919

2020
env:
2121
PHP_VERSION: "8.2"
22-
DRIVER_VERSION: "stable"
22+
# TODO: change to "stable" once 1.18.0 is released
23+
# DRIVER_VERSION: "stable"
24+
DRIVER_VERSION: "mongodb/mongo-php-driver@master"
2325

2426
jobs:
2527
phpcs:

.github/workflows/static-analysis.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ on:
1919

2020
env:
2121
PHP_VERSION: "8.2"
22-
DRIVER_VERSION: "stable"
22+
# TODO: change to "stable" once 1.18.0 is released
23+
# DRIVER_VERSION: "stable"
24+
DRIVER_VERSION: "mongodb/mongo-php-driver@master"
2325

2426
jobs:
2527
psalm:
@@ -35,7 +37,7 @@ jobs:
3537
uses: shivammathur/cache-extensions@v1
3638
with:
3739
php-version: ${{ env.PHP_VERSION }}
38-
extensions: "mongodb-${{ ENV.DRIVER_VERSION }}"
40+
extensions: "mongodb-${{ env.DRIVER_VERSION }}"
3941
key: "extcache-v1"
4042

4143
- name: Cache extensions
@@ -49,7 +51,7 @@ jobs:
4951
uses: "shivammathur/setup-php@v2"
5052
with:
5153
coverage: "none"
52-
extensions: "mongodb-${{ ENV.DRIVER_VERSION }}"
54+
extensions: "mongodb-${{ env.DRIVER_VERSION }}"
5355
php-version: "${{ env.PHP_VERSION }}"
5456
tools: "cs2pr"
5557

.github/workflows/tests.yml

+11-6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ on:
1717
paths-ignore:
1818
- "docs/**"
1919

20+
env:
21+
# TODO: change to "stable" once 1.18.0 is released
22+
# DRIVER_VERSION: "stable"
23+
DRIVER_VERSION: "mongodb/mongo-php-driver@master"
24+
2025
jobs:
2126
phpunit:
2227
name: "PHPUnit tests"
@@ -36,34 +41,34 @@ jobs:
3641
mongodb-version:
3742
- "4.4"
3843
driver-version:
39-
- "stable"
44+
- "${{ env.DRIVER_VERSION }}"
4045
topology:
4146
- "server"
4247
include:
4348
- os: "ubuntu-20.04"
4449
php-version: "8.0"
4550
mongodb-version: "6.0"
46-
driver-version: "stable"
51+
driver-version: "${{ env.DRIVER_VERSION }}"
4752
topology: "replica_set"
4853
- os: "ubuntu-20.04"
4954
php-version: "8.0"
5055
mongodb-version: "6.0"
51-
driver-version: "stable"
56+
driver-version: "${{ env.DRIVER_VERSION }}"
5257
topology: "sharded_cluster"
5358
- os: "ubuntu-20.04"
5459
php-version: "8.0"
5560
mongodb-version: "5.0"
56-
driver-version: "stable"
61+
driver-version: "${{ env.DRIVER_VERSION }}"
5762
topology: "server"
5863
- os: "ubuntu-20.04"
5964
php-version: "8.0"
6065
mongodb-version: "4.4"
61-
driver-version: "stable"
66+
driver-version: "${{ env.DRIVER_VERSION }}"
6267
topology: "replica_set"
6368
- os: "ubuntu-20.04"
6469
php-version: "8.0"
6570
mongodb-version: "4.4"
66-
driver-version: "stable"
71+
driver-version: "${{ env.DRIVER_VERSION }}"
6772
topology: "sharded_cluster"
6873

6974
steps:

composer.json

+1-1
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",

0 commit comments

Comments
 (0)