Skip to content

Commit d421c41

Browse files
committed
Update composer.json and CI matrices for 1.18.0
1 parent f823cfd commit d421c41

File tree

10 files changed

+29
-86
lines changed

10 files changed

+29
-86
lines changed

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

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

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

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

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

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

+2-9
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ 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"
129
- func: "upload extension"
1310
- name: "build-php-%phpVersion%-lowest"
1411
tags: ["build", "php%phpVersion%", "lowest"]
@@ -18,9 +15,7 @@ tasks:
1815
PHP_VERSION: "%phpVersion%"
1916
- func: "compile extension"
2017
vars:
21-
# TODO: change to "1.18.0" once 1.18.0 is released
22-
# EXTENSION_VERSION: "1.18.0"
23-
EXTENSION_BRANCH: "master"
18+
EXTENSION_VERSION: "1.18.0"
2419
- func: "upload extension"
2520
- name: "build-php-%phpVersion%-next-stable"
2621
tags: ["build", "php%phpVersion%", "next-stable"]
@@ -30,9 +25,7 @@ tasks:
3025
PHP_VERSION: "%phpVersion%"
3126
- func: "compile extension"
3227
vars:
33-
# TODO: change to "v1.18" once 1.18.0 is released
34-
# EXTENSION_VERSION: "v1.18"
35-
EXTENSION_BRANCH: "master"
28+
EXTENSION_BRANCH: "v1.18"
3629
- func: "upload extension"
3730
- name: "build-php-%phpVersion%-next-minor"
3831
tags: ["build", "php%phpVersion%", "next-minor"]

.github/workflows/coding-standards.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ on:
1515

1616
env:
1717
PHP_VERSION: "8.2"
18-
# TODO: change to "stable" once 1.18.0 is released
19-
# DRIVER_VERSION: "stable"
20-
DRIVER_VERSION: "mongodb/mongo-php-driver@master"
18+
DRIVER_VERSION: "stable"
2119

2220
jobs:
2321
phpcs:

.github/workflows/static-analysis.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ on:
1515

1616
env:
1717
PHP_VERSION: "8.2"
18-
# TODO: change to "stable" once 1.18.0 is released
19-
# DRIVER_VERSION: "stable"
20-
DRIVER_VERSION: "mongodb/mongo-php-driver@master"
18+
DRIVER_VERSION: "stable"
2119

2220
jobs:
2321
psalm:

.github/workflows/tests.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ on:
1818
- "docs/**"
1919

2020
env:
21-
# TODO: change to "stable" once 1.18.0 is released
22-
# DRIVER_VERSION: "stable"
23-
DRIVER_VERSION: "mongodb/mongo-php-driver@master"
21+
DRIVER_VERSION: "stable"
2422

2523
jobs:
2624
phpunit:

RELEASING.md

+14-23
Original file line numberDiff line numberDiff line change
@@ -51,33 +51,24 @@ of the library should depend on version `^1.15.0` of the extension and master
5151
branch alias should be `1.15.x-dev`.
5252

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

57-
```diff
58-
- id: "oldest-supported"
59-
- display_name: "PHPC 1.15-dev"
60-
+ display_name: "PHPC 1.15.0"
61-
variables:
62-
- EXTENSION_BRANCH: "master"
63-
+ EXTENSION_VERSION: "1.15.0"
64-
- id: "latest-stable"
65-
- display_name: "PHPC 1.15-dev"
66-
+ display_name: "PHPC 1.15.x"
67-
variables:
68-
- EXTENSION_BRANCH: "master"
69-
+ EXTENSION_VERSION: "stable"
70-
- id: "latest-dev"
71-
- display_name: "PHPC 1.15-dev"
72-
+ display_name: "PHPC 1.16-dev"
73-
variables:
74-
EXTENSION_BRANCH: "master"
75-
```
57+
* The `stable` task should specify no vars.
58+
* The `lowest` task should specify `EXTENSION_VERSION` with the version that
59+
was just released.
60+
* The `next-stable` task should specify `EXTENSION_BRANCH` with the branch that
61+
was just created.
62+
* The `next-minor` task should specify `EXTENSION_BRANCH: master`.
63+
64+
The `DRIVER_VERSION` environment variable for any GitHub Actions should also be
65+
set to `stable`.
7666

77-
Commit and push any changes:
67+
After regenerating the Evergreen configuration, stage any modified files,
68+
commit, and push:
7869

7970
```console
80-
$ git commit -m "Update composer.json and CI matrices for X.Y.Z" composer.json .evergreen/config.yml
71+
$ git commit -m "Update composer.json and CI matrices for X.Y.Z"
8172
$ git push mongodb
8273
```
8374

0 commit comments

Comments
 (0)