Skip to content

Merge v1.x into v2.x #1617

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

Closed
wants to merge 1 commit into from
Closed

Merge v1.x into v2.x #1617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 8 additions & 36 deletions .evergreen/config/generated/build/build-extension.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: 2 additions & 9 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 @@ -5,9 +5,6 @@
vars:
PHP_VERSION: "%phpVersion%"
- func: "compile extension"
# TODO: remove once 1.21.0 is released
vars:
EXTENSION_BRANCH: "v1.x"
- func: "upload extension"
- name: "build-php-%phpVersion%-lowest"
tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"]
Expand All @@ -17,9 +14,7 @@
PHP_VERSION: "%phpVersion%"
- func: "compile extension"
vars:
# TODO: change to "EXTENSION_VERSION: 1.21.0" once 1.21.0 is released
# EXTENSION_VERSION: "1.21.0"
EXTENSION_BRANCH: "v1.x"
EXTENSION_VERSION: "1.21.0"
- func: "upload extension"
- name: "build-php-%phpVersion%-next-stable"
tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"]
Expand All @@ -29,9 +24,7 @@
PHP_VERSION: "%phpVersion%"
- func: "compile extension"
vars:
# TODO: change to "v1.21" once 1.21.0 is released
# EXTENSION_BRANCH: "v1.21"
EXTENSION_BRANCH: "v1.x"
EXTENSION_BRANCH: "v1.21"
- func: "upload extension"
- name: "build-php-%phpVersion%-next-minor"
tags: ["build", "php%phpVersion%", "next-minor"]
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/coding-standards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ on:

env:
PHP_VERSION: "8.2"
# TODO: change to "stable" once 1.21.0 is released
# DRIVER_VERSION: "stable"
DRIVER_VERSION: "mongodb/[email protected]"
DRIVER_VERSION: "stable"

jobs:
phpcs:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/generator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ on:

env:
PHP_VERSION: "8.2"
# TODO: change to "stable" once 1.21.0 is released
# DRIVER_VERSION: "stable"
DRIVER_VERSION: "mongodb/[email protected]"
DRIVER_VERSION: "stable"

jobs:
psalm:
Expand Down
4 changes: 1 addition & 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,9 +19,7 @@ on:

env:
PHP_VERSION: "8.2"
# TODO: change to "stable" once 1.21.0 is released
# DRIVER_VERSION: "stable"
DRIVER_VERSION: "mongodb/[email protected]"
DRIVER_VERSION: "stable"

jobs:
psalm:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ on:
- "feature/*"

env:
# TODO: change to "stable" once 1.21.0 is released
# DRIVER_VERSION: "stable"
DRIVER_VERSION: "mongodb/[email protected]"
DRIVER_VERSION: "stable"

jobs:
phpunit:
Expand Down
Loading