From d421c418ef56a96f3dfa6b2828f936df6848ccf9 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Wed, 27 Mar 2024 13:04:50 -0400 Subject: [PATCH] Update composer.json and CI matrices for 1.18.0 --- .../config/generated/build/build-php-7.4.yml | 11 +----- .../config/generated/build/build-php-8.0.yml | 11 +----- .../config/generated/build/build-php-8.1.yml | 11 +----- .../config/generated/build/build-php-8.2.yml | 11 +----- .../config/generated/build/build-php-8.3.yml | 11 +----- .../templates/build/build-extension.yml | 11 +----- .github/workflows/coding-standards.yml | 4 +- .github/workflows/static-analysis.yml | 4 +- .github/workflows/tests.yml | 4 +- RELEASING.md | 37 +++++++------------ 10 files changed, 29 insertions(+), 86 deletions(-) diff --git a/.evergreen/config/generated/build/build-php-7.4.yml b/.evergreen/config/generated/build/build-php-7.4.yml index f9ea50615..c4fe5b629 100644 --- a/.evergreen/config/generated/build/build-php-7.4.yml +++ b/.evergreen/config/generated/build/build-php-7.4.yml @@ -7,9 +7,6 @@ tasks: vars: PHP_VERSION: "7.4" - func: "compile extension" - vars: - # TODO: remove this 1.18.0 is released - EXTENSION_BRANCH: "master" - func: "upload extension" - name: "build-php-7.4-lowest" tags: ["build", "php7.4", "lowest"] @@ -19,9 +16,7 @@ tasks: PHP_VERSION: "7.4" - 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-7.4-next-stable" tags: ["build", "php7.4", "next-stable"] @@ -31,9 +26,7 @@ tasks: PHP_VERSION: "7.4" - 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-7.4-next-minor" tags: ["build", "php7.4", "next-minor"] diff --git a/.evergreen/config/generated/build/build-php-8.0.yml b/.evergreen/config/generated/build/build-php-8.0.yml index 9b971466c..87bcccf7a 100644 --- a/.evergreen/config/generated/build/build-php-8.0.yml +++ b/.evergreen/config/generated/build/build-php-8.0.yml @@ -7,9 +7,6 @@ tasks: vars: PHP_VERSION: "8.0" - func: "compile extension" - vars: - # TODO: remove this 1.18.0 is released - EXTENSION_BRANCH: "master" - func: "upload extension" - name: "build-php-8.0-lowest" tags: ["build", "php8.0", "lowest"] @@ -19,9 +16,7 @@ tasks: PHP_VERSION: "8.0" - 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-8.0-next-stable" tags: ["build", "php8.0", "next-stable"] @@ -31,9 +26,7 @@ tasks: PHP_VERSION: "8.0" - 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-8.0-next-minor" tags: ["build", "php8.0", "next-minor"] diff --git a/.evergreen/config/generated/build/build-php-8.1.yml b/.evergreen/config/generated/build/build-php-8.1.yml index d0eeb3350..466585557 100644 --- a/.evergreen/config/generated/build/build-php-8.1.yml +++ b/.evergreen/config/generated/build/build-php-8.1.yml @@ -7,9 +7,6 @@ tasks: vars: PHP_VERSION: "8.1" - func: "compile extension" - vars: - # TODO: remove this 1.18.0 is released - EXTENSION_BRANCH: "master" - func: "upload extension" - name: "build-php-8.1-lowest" tags: ["build", "php8.1", "lowest"] @@ -19,9 +16,7 @@ tasks: PHP_VERSION: "8.1" - 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-8.1-next-stable" tags: ["build", "php8.1", "next-stable"] @@ -31,9 +26,7 @@ tasks: PHP_VERSION: "8.1" - 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-8.1-next-minor" tags: ["build", "php8.1", "next-minor"] diff --git a/.evergreen/config/generated/build/build-php-8.2.yml b/.evergreen/config/generated/build/build-php-8.2.yml index 1c18dc746..f18297acf 100644 --- a/.evergreen/config/generated/build/build-php-8.2.yml +++ b/.evergreen/config/generated/build/build-php-8.2.yml @@ -7,9 +7,6 @@ tasks: vars: PHP_VERSION: "8.2" - func: "compile extension" - vars: - # TODO: remove this 1.18.0 is released - EXTENSION_BRANCH: "master" - func: "upload extension" - name: "build-php-8.2-lowest" tags: ["build", "php8.2", "lowest"] @@ -19,9 +16,7 @@ tasks: PHP_VERSION: "8.2" - 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-8.2-next-stable" tags: ["build", "php8.2", "next-stable"] @@ -31,9 +26,7 @@ tasks: PHP_VERSION: "8.2" - 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-8.2-next-minor" tags: ["build", "php8.2", "next-minor"] diff --git a/.evergreen/config/generated/build/build-php-8.3.yml b/.evergreen/config/generated/build/build-php-8.3.yml index 108a0983b..a788199a6 100644 --- a/.evergreen/config/generated/build/build-php-8.3.yml +++ b/.evergreen/config/generated/build/build-php-8.3.yml @@ -7,9 +7,6 @@ tasks: vars: PHP_VERSION: "8.3" - func: "compile extension" - vars: - # TODO: remove this 1.18.0 is released - EXTENSION_BRANCH: "master" - func: "upload extension" - name: "build-php-8.3-lowest" tags: ["build", "php8.3", "lowest"] @@ -19,9 +16,7 @@ tasks: PHP_VERSION: "8.3" - 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-8.3-next-stable" tags: ["build", "php8.3", "next-stable"] @@ -31,9 +26,7 @@ tasks: PHP_VERSION: "8.3" - 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-8.3-next-minor" tags: ["build", "php8.3", "next-minor"] diff --git a/.evergreen/config/templates/build/build-extension.yml b/.evergreen/config/templates/build/build-extension.yml index 140b0a5d0..d63c37b81 100644 --- a/.evergreen/config/templates/build/build-extension.yml +++ b/.evergreen/config/templates/build/build-extension.yml @@ -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"] @@ -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"] @@ -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"] diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 566e2eb7e..5cec3c90d 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -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: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 1d062abde..629c125bb 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -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: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e2f5987b4..6e60edc07 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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: diff --git a/RELEASING.md b/RELEASING.md index 8d39f61ca..04318fc74 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -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 ```