From 75da9ea3b63d97b05e0e8648d8c09a17bc54c0b6 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 25 Sep 2024 14:54:08 +0200 Subject: [PATCH] Don't build with PHPC 1.x on legacy PHP versions (#1456) --- .evergreen/config.yml | 1 + .evergreen/config/generate-config.php | 1 + .../build/build-extension-next-minor.yml | 32 ++++++++++++ .../generated/build/build-extension.yml | 50 ------------------- .../build/build-extension-next-minor.yml | 10 ++++ .../templates/build/build-extension.yml | 10 ---- 6 files changed, 44 insertions(+), 60 deletions(-) create mode 100644 .evergreen/config/generated/build/build-extension-next-minor.yml create mode 100644 .evergreen/config/templates/build/build-extension-next-minor.yml diff --git a/.evergreen/config.yml b/.evergreen/config.yml index aede36c7e..89af57e31 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -66,6 +66,7 @@ include: # Automatically generated files - filename: .evergreen/config/generated/build/build-extension.yml + - filename: .evergreen/config/generated/build/build-extension-next-minor.yml - filename: .evergreen/config/generated/test/local.yml - filename: .evergreen/config/generated/test/load-balanced.yml - filename: .evergreen/config/generated/test/require-api-version.yml diff --git a/.evergreen/config/generate-config.php b/.evergreen/config/generate-config.php index b87051571..f80c54a84 100644 --- a/.evergreen/config/generate-config.php +++ b/.evergreen/config/generate-config.php @@ -51,6 +51,7 @@ // Build tasks $allFiles[] = generateConfigs('tasks', 'build', 'phpVersion', 'build-extension.yml', $supportedPhpVersions); +$allFiles[] = generateConfigs('tasks', 'build', 'phpVersion', 'build-extension-next-minor.yml', $modernPhpVersions); // Test tasks $allFiles[] = generateConfigs('tasks', 'test', 'mongodbVersion', 'local.yml', $localServerVersions); diff --git a/.evergreen/config/generated/build/build-extension-next-minor.yml b/.evergreen/config/generated/build/build-extension-next-minor.yml new file mode 100644 index 000000000..5bac183b8 --- /dev/null +++ b/.evergreen/config/generated/build/build-extension-next-minor.yml @@ -0,0 +1,32 @@ +# This file is generated automatically - please edit the "templates/build/build-extension-next-minor.yml" template file instead. +tasks: + - name: "build-php-8.3-next-minor" + tags: ["build", "php8.3", "next-minor"] + commands: + - func: "locate PHP binaries" + vars: + PHP_VERSION: "8.3" + - func: "compile extension" + vars: + EXTENSION_BRANCH: "v1.x" + - func: "upload extension" + - name: "build-php-8.2-next-minor" + tags: ["build", "php8.2", "next-minor"] + commands: + - func: "locate PHP binaries" + vars: + PHP_VERSION: "8.2" + - func: "compile extension" + vars: + EXTENSION_BRANCH: "v1.x" + - func: "upload extension" + - name: "build-php-8.1-next-minor" + tags: ["build", "php8.1", "next-minor"] + commands: + - func: "locate PHP binaries" + vars: + PHP_VERSION: "8.1" + - func: "compile extension" + vars: + EXTENSION_BRANCH: "v1.x" + - func: "upload extension" diff --git a/.evergreen/config/generated/build/build-extension.yml b/.evergreen/config/generated/build/build-extension.yml index 54c2b2a2a..1240edccd 100644 --- a/.evergreen/config/generated/build/build-extension.yml +++ b/.evergreen/config/generated/build/build-extension.yml @@ -28,16 +28,6 @@ tasks: vars: EXTENSION_BRANCH: "v1.20" - func: "upload extension" - - name: "build-php-8.3-next-minor" - tags: ["build", "php8.3", "next-minor"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.3" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.x" - - func: "upload extension" - name: "build-php-8.2" tags: ["build", "php8.2", "stable", "pr", "tag"] commands: @@ -66,16 +56,6 @@ tasks: vars: EXTENSION_BRANCH: "v1.20" - func: "upload extension" - - name: "build-php-8.2-next-minor" - tags: ["build", "php8.2", "next-minor"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.2" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.x" - - func: "upload extension" - name: "build-php-8.1" tags: ["build", "php8.1", "stable", "pr", "tag"] commands: @@ -104,16 +84,6 @@ tasks: vars: EXTENSION_BRANCH: "v1.20" - func: "upload extension" - - name: "build-php-8.1-next-minor" - tags: ["build", "php8.1", "next-minor"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.1" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.x" - - func: "upload extension" - name: "build-php-8.0" tags: ["build", "php8.0", "stable", "pr", "tag"] commands: @@ -142,16 +112,6 @@ tasks: vars: EXTENSION_BRANCH: "v1.20" - func: "upload extension" - - name: "build-php-8.0-next-minor" - tags: ["build", "php8.0", "next-minor"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "8.0" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.x" - - func: "upload extension" - name: "build-php-7.4" tags: ["build", "php7.4", "stable", "pr", "tag"] commands: @@ -180,13 +140,3 @@ tasks: vars: EXTENSION_BRANCH: "v1.20" - func: "upload extension" - - name: "build-php-7.4-next-minor" - tags: ["build", "php7.4", "next-minor"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "7.4" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.x" - - func: "upload extension" diff --git a/.evergreen/config/templates/build/build-extension-next-minor.yml b/.evergreen/config/templates/build/build-extension-next-minor.yml new file mode 100644 index 000000000..1638e25ad --- /dev/null +++ b/.evergreen/config/templates/build/build-extension-next-minor.yml @@ -0,0 +1,10 @@ + - name: "build-php-%phpVersion%-next-minor" + tags: ["build", "php%phpVersion%", "next-minor"] + commands: + - func: "locate PHP binaries" + vars: + PHP_VERSION: "%phpVersion%" + - func: "compile extension" + vars: + EXTENSION_BRANCH: "v1.x" + - func: "upload extension" diff --git a/.evergreen/config/templates/build/build-extension.yml b/.evergreen/config/templates/build/build-extension.yml index 869c0a9e4..4592aadab 100644 --- a/.evergreen/config/templates/build/build-extension.yml +++ b/.evergreen/config/templates/build/build-extension.yml @@ -26,13 +26,3 @@ vars: EXTENSION_BRANCH: "v1.20" - func: "upload extension" - - name: "build-php-%phpVersion%-next-minor" - tags: ["build", "php%phpVersion%", "next-minor"] - commands: - - func: "locate PHP binaries" - vars: - PHP_VERSION: "%phpVersion%" - - func: "compile extension" - vars: - EXTENSION_BRANCH: "v1.x" - - func: "upload extension"