From 079fa45092f5c2778fe1a86be78dc0c3566c5d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Fri, 23 May 2025 11:00:11 +0200 Subject: [PATCH] Switch tests to latest stable release of extension v2.1+ --- .../generated/build/build-extension.yml | 44 ------------------- .../templates/build/build-extension.yml | 11 ----- .github/workflows/coding-standards.yml | 4 +- .github/workflows/generator.yml | 4 +- .github/workflows/static-analysis.yml | 4 +- .github/workflows/tests.yml | 4 +- 6 files changed, 4 insertions(+), 67 deletions(-) diff --git a/.evergreen/config/generated/build/build-extension.yml b/.evergreen/config/generated/build/build-extension.yml index 48c7c26a3..48e6b5a1f 100644 --- a/.evergreen/config/generated/build/build-extension.yml +++ b/.evergreen/config/generated/build/build-extension.yml @@ -7,9 +7,6 @@ tasks: vars: PHP_VERSION: "8.4" - func: "compile extension" - # TODO: Remove vars to switch to latest stable version when 2.1.0 is releeased - vars: - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-8.4-lowest" tags: ["build", "php8.4", "lowest", "pr", "tag"] @@ -18,10 +15,6 @@ tasks: vars: PHP_VERSION: "8.4" - func: "compile extension" - vars: - # TODO: Switch to 2.1.0 when it is released - # EXTENSION_VERSION: "2.0.0" - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-8.4-next-stable" tags: ["build", "php8.4", "next-stable", "pr", "tag"] @@ -30,10 +23,6 @@ tasks: vars: PHP_VERSION: "8.4" - func: "compile extension" - vars: - # TODO: Switch to v2.1 when 2.1.0 is released - # EXTENSION_VERSION: "v2.1" - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-8.4-next-minor" tags: ["build", "php8.4", "next-minor"] @@ -52,9 +41,6 @@ tasks: vars: PHP_VERSION: "8.3" - func: "compile extension" - # TODO: Remove vars to switch to latest stable version when 2.1.0 is releeased - vars: - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-8.3-lowest" tags: ["build", "php8.3", "lowest", "pr", "tag"] @@ -63,10 +49,6 @@ tasks: vars: PHP_VERSION: "8.3" - func: "compile extension" - vars: - # TODO: Switch to 2.1.0 when it is released - # EXTENSION_VERSION: "2.0.0" - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-8.3-next-stable" tags: ["build", "php8.3", "next-stable", "pr", "tag"] @@ -75,10 +57,6 @@ tasks: vars: PHP_VERSION: "8.3" - func: "compile extension" - vars: - # TODO: Switch to v2.1 when 2.1.0 is released - # EXTENSION_VERSION: "v2.1" - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-8.3-next-minor" tags: ["build", "php8.3", "next-minor"] @@ -97,9 +75,6 @@ tasks: vars: PHP_VERSION: "8.2" - func: "compile extension" - # TODO: Remove vars to switch to latest stable version when 2.1.0 is releeased - vars: - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-8.2-lowest" tags: ["build", "php8.2", "lowest", "pr", "tag"] @@ -108,10 +83,6 @@ tasks: vars: PHP_VERSION: "8.2" - func: "compile extension" - vars: - # TODO: Switch to 2.1.0 when it is released - # EXTENSION_VERSION: "2.0.0" - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-8.2-next-stable" tags: ["build", "php8.2", "next-stable", "pr", "tag"] @@ -120,10 +91,6 @@ tasks: vars: PHP_VERSION: "8.2" - func: "compile extension" - vars: - # TODO: Switch to v2.1 when 2.1.0 is released - # EXTENSION_VERSION: "v2.1" - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-8.2-next-minor" tags: ["build", "php8.2", "next-minor"] @@ -142,9 +109,6 @@ tasks: vars: PHP_VERSION: "8.1" - func: "compile extension" - # TODO: Remove vars to switch to latest stable version when 2.1.0 is releeased - vars: - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-8.1-lowest" tags: ["build", "php8.1", "lowest", "pr", "tag"] @@ -153,10 +117,6 @@ tasks: vars: PHP_VERSION: "8.1" - func: "compile extension" - vars: - # TODO: Switch to 2.1.0 when it is released - # EXTENSION_VERSION: "2.0.0" - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-8.1-next-stable" tags: ["build", "php8.1", "next-stable", "pr", "tag"] @@ -165,10 +125,6 @@ tasks: vars: PHP_VERSION: "8.1" - func: "compile extension" - vars: - # TODO: Switch to v2.1 when 2.1.0 is released - # EXTENSION_VERSION: "v2.1" - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-8.1-next-minor" tags: ["build", "php8.1", "next-minor"] diff --git a/.evergreen/config/templates/build/build-extension.yml b/.evergreen/config/templates/build/build-extension.yml index c6b1f411c..39f478cac 100644 --- a/.evergreen/config/templates/build/build-extension.yml +++ b/.evergreen/config/templates/build/build-extension.yml @@ -5,9 +5,6 @@ vars: PHP_VERSION: "%phpVersion%" - func: "compile extension" - # TODO: Remove vars to switch to latest stable version when 2.1.0 is releeased - vars: - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-%phpVersion%-lowest" tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"] @@ -16,10 +13,6 @@ vars: PHP_VERSION: "%phpVersion%" - func: "compile extension" - vars: - # TODO: Switch to 2.1.0 when it is released - # EXTENSION_VERSION: "2.0.0" - EXTENSION_BRANCH: "v2.x" - func: "upload extension" - name: "build-php-%phpVersion%-next-stable" tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"] @@ -28,10 +21,6 @@ vars: PHP_VERSION: "%phpVersion%" - func: "compile extension" - vars: - # TODO: Switch to v2.1 when 2.1.0 is released - # EXTENSION_VERSION: "v2.1" - EXTENSION_BRANCH: "v2.x" - 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 3810a5ded..bb6091805 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -13,9 +13,7 @@ on: env: PHP_VERSION: "8.2" - # TODO: change to "stable" once 2.0.0 is released - # DRIVER_VERSION: "stable" - DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x" + DRIVER_VERSION: "stable" jobs: phpcs: diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml index 008f8d84b..e64e8feeb 100644 --- a/.github/workflows/generator.yml +++ b/.github/workflows/generator.yml @@ -13,9 +13,7 @@ on: env: PHP_VERSION: "8.2" - # TODO: change to "stable" once 2.0.0 is released - # DRIVER_VERSION: "stable" - DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x" + DRIVER_VERSION: "stable" jobs: diff: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index cf96ca895..3447142a3 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -19,9 +19,7 @@ on: env: PHP_VERSION: "8.2" - # TODO: change to "stable" once 2.0.0 is released - # DRIVER_VERSION: "stable" - DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x" + DRIVER_VERSION: "stable" jobs: psalm: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9281d8516..956e0ec61 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,9 +12,7 @@ on: - "feature/*" env: - # TODO: change to "stable" once 2.0.0 is released - # DRIVER_VERSION: "stable" - DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x" + DRIVER_VERSION: "stable" jobs: phpunit: