From 7b7891eb29f7161471602201fe168a667a2b2156 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Thu, 10 Apr 2025 09:50:50 +0200 Subject: [PATCH] Test against 1.x branches/releases only (#1660) --- .../generated/build/build-extension.yml | 48 ++++--------------- .../config/generated/test-variant/phpc.yml | 20 -------- .../templates/build/build-extension.yml | 12 +---- .../config/templates/test-variant/phpc.yml | 20 -------- .github/workflows/coding-standards.yml | 2 +- .github/workflows/generator.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- .github/workflows/tests.yml | 2 +- 8 files changed, 14 insertions(+), 94 deletions(-) diff --git a/.evergreen/config/generated/build/build-extension.yml b/.evergreen/config/generated/build/build-extension.yml index 14b8e60b0..94418d16b 100644 --- a/.evergreen/config/generated/build/build-extension.yml +++ b/.evergreen/config/generated/build/build-extension.yml @@ -7,6 +7,8 @@ tasks: vars: PHP_VERSION: "8.4" - func: "compile extension" + vars: + EXTENSION_BRANCH: "v1.21" - func: "upload extension" - name: "build-php-8.4-lowest" tags: ["build", "php8.4", "lowest", "pr", "tag"] @@ -18,16 +20,6 @@ tasks: vars: EXTENSION_VERSION: "1.21.0" - func: "upload extension" - - name: "build-php-8.4-next-stable" - tags: ["build", "php8.4", "next-stable", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.4" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.21" - - func: "upload extension" - name: "build-php-8.4-next-minor" tags: ["build", "php8.4", "next-minor"] commands: @@ -45,6 +37,8 @@ tasks: vars: PHP_VERSION: "8.3" - func: "compile extension" + vars: + EXTENSION_BRANCH: "v1.21" - func: "upload extension" - name: "build-php-8.3-lowest" tags: ["build", "php8.3", "lowest", "pr", "tag"] @@ -56,16 +50,6 @@ tasks: vars: EXTENSION_VERSION: "1.21.0" - func: "upload extension" - - name: "build-php-8.3-next-stable" - tags: ["build", "php8.3", "next-stable", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.3" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.21" - - func: "upload extension" - name: "build-php-8.3-next-minor" tags: ["build", "php8.3", "next-minor"] commands: @@ -83,6 +67,8 @@ tasks: vars: PHP_VERSION: "8.2" - func: "compile extension" + vars: + EXTENSION_BRANCH: "v1.21" - func: "upload extension" - name: "build-php-8.2-lowest" tags: ["build", "php8.2", "lowest", "pr", "tag"] @@ -94,16 +80,6 @@ tasks: vars: EXTENSION_VERSION: "1.21.0" - func: "upload extension" - - name: "build-php-8.2-next-stable" - tags: ["build", "php8.2", "next-stable", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.2" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.21" - - func: "upload extension" - name: "build-php-8.2-next-minor" tags: ["build", "php8.2", "next-minor"] commands: @@ -121,6 +97,8 @@ tasks: vars: PHP_VERSION: "8.1" - func: "compile extension" + vars: + EXTENSION_BRANCH: "v1.21" - func: "upload extension" - name: "build-php-8.1-lowest" tags: ["build", "php8.1", "lowest", "pr", "tag"] @@ -132,16 +110,6 @@ tasks: vars: EXTENSION_VERSION: "1.21.0" - func: "upload extension" - - name: "build-php-8.1-next-stable" - tags: ["build", "php8.1", "next-stable", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.1" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.21" - - func: "upload extension" - name: "build-php-8.1-next-minor" tags: ["build", "php8.1", "next-minor"] commands: diff --git a/.evergreen/config/generated/test-variant/phpc.yml b/.evergreen/config/generated/test-variant/phpc.yml index e0eb428ce..b40768f8d 100644 --- a/.evergreen/config/generated/test-variant/phpc.yml +++ b/.evergreen/config/generated/test-variant/phpc.yml @@ -1,26 +1,6 @@ # This file is generated automatically - please edit the "templates/test-variant/phpc.yml" template file instead. buildvariants: # Variants with different PHPC versions - - name: test-debian12-php-8.3-phpc-next-stable - tags: ["test", "debian", "x64", "php8.3", "pr", "tag"] - display_name: "Test: Debian 12, PHP 8.3, PHPC next-stable" - run_on: debian12-small - expansions: - FETCH_BUILD_VARIANT: "build-debian12" - FETCH_BUILD_TASK: "build-php-8.3-next-stable" - PHP_VERSION: "8.3" - depends_on: - - variant: "build-debian12" - name: "build-php-8.3-next-stable" - tasks: - - ".standalone .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - ".replicaset .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - ".sharded .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - ".loadbalanced .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - "test_serverless_task_group" - - "test_serverless_proxy_task_group" - - "test-atlas-data-lake" - - name: test-debian12-php-8.3-phpc-next-minor tags: ["test", "debian", "x64", "php8.3"] display_name: "Test: Debian 12, PHP 8.3, PHPC next-minor" diff --git a/.evergreen/config/templates/build/build-extension.yml b/.evergreen/config/templates/build/build-extension.yml index 39f32d80d..fe9afcc42 100644 --- a/.evergreen/config/templates/build/build-extension.yml +++ b/.evergreen/config/templates/build/build-extension.yml @@ -5,6 +5,8 @@ vars: PHP_VERSION: "%phpVersion%" - func: "compile extension" + vars: + EXTENSION_BRANCH: "v1.21" - func: "upload extension" - name: "build-php-%phpVersion%-lowest" tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"] @@ -16,16 +18,6 @@ vars: EXTENSION_VERSION: "1.21.0" - func: "upload extension" - - name: "build-php-%phpVersion%-next-stable" - tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "%phpVersion%" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.21" - - func: "upload extension" - name: "build-php-%phpVersion%-next-minor" tags: ["build", "php%phpVersion%", "next-minor"] commands: diff --git a/.evergreen/config/templates/test-variant/phpc.yml b/.evergreen/config/templates/test-variant/phpc.yml index 88d0dd248..fa01cde19 100644 --- a/.evergreen/config/templates/test-variant/phpc.yml +++ b/.evergreen/config/templates/test-variant/phpc.yml @@ -1,24 +1,4 @@ # Variants with different PHPC versions - - name: test-debian12-php-%phpVersion%-phpc-next-stable - tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] - display_name: "Test: Debian 12, PHP %phpVersion%, PHPC next-stable" - run_on: debian12-small - expansions: - FETCH_BUILD_VARIANT: "build-debian12" - FETCH_BUILD_TASK: "build-php-%phpVersion%-next-stable" - PHP_VERSION: "%phpVersion%" - depends_on: - - variant: "build-debian12" - name: "build-php-%phpVersion%-next-stable" - tasks: - - ".standalone .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - ".replicaset .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - ".sharded .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - ".loadbalanced .local !.csfle !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - "test_serverless_task_group" - - "test_serverless_proxy_task_group" - - "test-atlas-data-lake" - - name: test-debian12-php-%phpVersion%-phpc-next-minor tags: ["test", "debian", "x64", "php%phpVersion%"] display_name: "Test: Debian 12, PHP %phpVersion%, PHPC next-minor" diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 462e4d67e..5552b1b6b 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -13,7 +13,7 @@ on: env: PHP_VERSION: "8.2" - DRIVER_VERSION: "stable" + DRIVER_VERSION: "mongodb/mongo-php-driver@v1.21" jobs: phpcs: diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml index 9b504ef34..9fea10b56 100644 --- a/.github/workflows/generator.yml +++ b/.github/workflows/generator.yml @@ -13,7 +13,7 @@ on: env: PHP_VERSION: "8.2" - DRIVER_VERSION: "stable" + DRIVER_VERSION: "mongodb/mongo-php-driver@v1.21" jobs: psalm: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 0103bdcd1..849ed7e7b 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -19,7 +19,7 @@ on: env: PHP_VERSION: "8.2" - DRIVER_VERSION: "stable" + DRIVER_VERSION: "mongodb/mongo-php-driver@v1.21" jobs: psalm: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 36640a724..b43d76c60 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ on: - "feature/*" env: - DRIVER_VERSION: "stable" + DRIVER_VERSION: "mongodb/mongo-php-driver@v1.21" jobs: phpunit: