Skip to content

PHPLIB-1297: pre-4.4 mongos writeConcernError does not determine retryability #1221

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jan 25, 2024
Merged

PHPLIB-1297: pre-4.4 mongos writeConcernError does not determine retryability #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
626719b
PHPLIB-1297: pre-4.4 mongos writeConcernError does not determine retr…
jmikola Jan 24, 2024
d0f556a
Use lowercase name to access env context var
jmikola Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .evergreen/config/generated/build/build-php-7.4.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions .evergreen/config/generated/build/build-php-8.0.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions .evergreen/config/generated/build/build-php-8.1.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions .evergreen/config/generated/build/build-php-8.2.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions .evergreen/config/generated/build/build-php-8.3.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions .evergreen/config/templates/build/build-extension.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ tasks:
vars:
PHP_VERSION: "%phpVersion%"
- func: "compile extension"
vars:
# TODO: remove this 1.18.0 is released
EXTENSION_BRANCH: "master"
- func: "upload extension"
- name: "build-php-%phpVersion%-lowest"
tags: ["build", "php%phpVersion%", "lowest"]
Expand All @@ -15,7 +18,9 @@ tasks:
PHP_VERSION: "%phpVersion%"
- func: "compile extension"
vars:
EXTENSION_VERSION: "1.17.0"
# TODO: change to "1.18.0" once 1.18.0 is released
# EXTENSION_VERSION: "1.18.0"
EXTENSION_BRANCH: "master"
- func: "upload extension"
- name: "build-php-%phpVersion%-next-stable"
tags: ["build", "php%phpVersion%", "next-stable"]
Expand All @@ -25,7 +30,9 @@ tasks:
PHP_VERSION: "%phpVersion%"
- func: "compile extension"
vars:
EXTENSION_BRANCH: "v1.17"
# TODO: change to "v1.18" once 1.18.0 is released
# EXTENSION_VERSION: "v1.18"
EXTENSION_BRANCH: "master"
- func: "upload extension"
- name: "build-php-%phpVersion%-next-minor"
tags: ["build", "php%phpVersion%", "next-minor"]
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/coding-standards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ on:

env:
PHP_VERSION: "8.2"
DRIVER_VERSION: "stable"
# TODO: change to "stable" once 1.18.0 is released
# DRIVER_VERSION: "stable"
DRIVER_VERSION: "mongodb/mongo-php-driver@master"

jobs:
phpcs:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/static-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ on:

env:
PHP_VERSION: "8.2"
DRIVER_VERSION: "stable"
# TODO: change to "stable" once 1.18.0 is released
# DRIVER_VERSION: "stable"
DRIVER_VERSION: "mongodb/mongo-php-driver@master"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, I'm a little embarrassed I didn't think of this sooner. 👍


jobs:
psalm:
Expand All @@ -35,7 +37,7 @@ jobs:
uses: shivammathur/cache-extensions@v1
with:
php-version: ${{ env.PHP_VERSION }}
extensions: "mongodb-${{ ENV.DRIVER_VERSION }}"
extensions: "mongodb-${{ env.DRIVER_VERSION }}"
key: "extcache-v1"

- name: Cache extensions
Expand All @@ -49,7 +51,7 @@ jobs:
uses: "shivammathur/setup-php@v2"
with:
coverage: "none"
extensions: "mongodb-${{ ENV.DRIVER_VERSION }}"
extensions: "mongodb-${{ env.DRIVER_VERSION }}"
php-version: "${{ env.PHP_VERSION }}"
tools: "cs2pr"

Expand Down
17 changes: 11 additions & 6 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ on:
paths-ignore:
- "docs/**"

env:
# TODO: change to "stable" once 1.18.0 is released
# DRIVER_VERSION: "stable"
DRIVER_VERSION: "mongodb/mongo-php-driver@master"

jobs:
phpunit:
name: "PHPUnit tests"
Expand All @@ -36,34 +41,34 @@ jobs:
mongodb-version:
- "4.4"
driver-version:
- "stable"
- "${{ env.DRIVER_VERSION }}"
topology:
- "server"
include:
- os: "ubuntu-20.04"
php-version: "8.0"
mongodb-version: "6.0"
driver-version: "stable"
driver-version: "${{ env.DRIVER_VERSION }}"
topology: "replica_set"
- os: "ubuntu-20.04"
php-version: "8.0"
mongodb-version: "6.0"
driver-version: "stable"
driver-version: "${{ env.DRIVER_VERSION }}"
topology: "sharded_cluster"
- os: "ubuntu-20.04"
php-version: "8.0"
mongodb-version: "5.0"
driver-version: "stable"
driver-version: "${{ env.DRIVER_VERSION }}"
topology: "server"
- os: "ubuntu-20.04"
php-version: "8.0"
mongodb-version: "4.4"
driver-version: "stable"
driver-version: "${{ env.DRIVER_VERSION }}"
topology: "replica_set"
- os: "ubuntu-20.04"
php-version: "8.0"
mongodb-version: "4.4"
driver-version: "stable"
driver-version: "${{ env.DRIVER_VERSION }}"
topology: "sharded_cluster"

steps:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"php": "^7.4 || ^8.0",
"ext-hash": "*",
"ext-json": "*",
"ext-mongodb": "^1.17.0",
"ext-mongodb": "^1.18.0",
"jean85/pretty-package-versions": "^2.0.1",
"psr/log": "^1.1.4|^2|^3",
"symfony/polyfill-php80": "^1.27",
Expand Down
Loading