Skip to content

Commit

Permalink
Update composer.json and CI matrices for 1.18.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jmikola committed Mar 27, 2024
1 parent f823cfd commit d421c41
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 86 deletions.
11 changes: 2 additions & 9 deletions .evergreen/config/generated/build/build-php-7.4.yml

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/generated/build/build-php-8.0.yml

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/generated/build/build-php-8.1.yml

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/generated/build/build-php-8.2.yml

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/generated/build/build-php-8.3.yml

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
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ 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 @@ -18,9 +15,7 @@ tasks:
PHP_VERSION: "%phpVersion%"
- func: "compile extension"
vars:
# TODO: change to "1.18.0" once 1.18.0 is released
# EXTENSION_VERSION: "1.18.0"
EXTENSION_BRANCH: "master"
EXTENSION_VERSION: "1.18.0"
- func: "upload extension"
- name: "build-php-%phpVersion%-next-stable"
tags: ["build", "php%phpVersion%", "next-stable"]
Expand All @@ -30,9 +25,7 @@ tasks:
PHP_VERSION: "%phpVersion%"
- func: "compile extension"
vars:
# TODO: change to "v1.18" once 1.18.0 is released
# EXTENSION_VERSION: "v1.18"
EXTENSION_BRANCH: "master"
EXTENSION_BRANCH: "v1.18"
- 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
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ on:

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

jobs:
phpcs:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ on:

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

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

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

jobs:
phpunit:
Expand Down
37 changes: 14 additions & 23 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,33 +51,24 @@ of the library should depend on version `^1.15.0` of the extension and master
branch alias should be `1.15.x-dev`.

If this is the first release of a minor version for the library, it is likely
following an extension release. In that case, the `driver-versions` matrix in
the Evergreen configuration should be updated:
following an extension release. The `vars` for calling `compile extension` from
`build-extension.yml` in the Evergreen configuration must be updated:

```diff
- id: "oldest-supported"
- display_name: "PHPC 1.15-dev"
+ display_name: "PHPC 1.15.0"
variables:
- EXTENSION_BRANCH: "master"
+ EXTENSION_VERSION: "1.15.0"
- id: "latest-stable"
- display_name: "PHPC 1.15-dev"
+ display_name: "PHPC 1.15.x"
variables:
- EXTENSION_BRANCH: "master"
+ EXTENSION_VERSION: "stable"
- id: "latest-dev"
- display_name: "PHPC 1.15-dev"
+ display_name: "PHPC 1.16-dev"
variables:
EXTENSION_BRANCH: "master"
```
* The `stable` task should specify no vars.
* The `lowest` task should specify `EXTENSION_VERSION` with the version that
was just released.
* The `next-stable` task should specify `EXTENSION_BRANCH` with the branch that
was just created.
* The `next-minor` task should specify `EXTENSION_BRANCH: master`.

The `DRIVER_VERSION` environment variable for any GitHub Actions should also be
set to `stable`.

Commit and push any changes:
After regenerating the Evergreen configuration, stage any modified files,
commit, and push:

```console
$ git commit -m "Update composer.json and CI matrices for X.Y.Z" composer.json .evergreen/config.yml
$ git commit -m "Update composer.json and CI matrices for X.Y.Z"
$ git push mongodb
```

Expand Down

0 comments on commit d421c41

Please sign in to comment.