From 6960db055790a0b4bd1f79eae741040d9331db18 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 28 Feb 2025 12:04:34 +0100 Subject: [PATCH 1/2] Test stable extension version in CI (#1615) --- .../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, 14 insertions(+), 57 deletions(-) diff --git a/.evergreen/config/generated/build/build-extension.yml b/.evergreen/config/generated/build/build-extension.yml index a74e18776..14b8e60b0 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 once 1.21.0 is released - vars: - EXTENSION_BRANCH: "v1.x" - func: "upload extension" - name: "build-php-8.4-lowest" tags: ["build", "php8.4", "lowest", "pr", "tag"] @@ -19,9 +16,7 @@ tasks: PHP_VERSION: "8.4" - func: "compile extension" vars: - # TODO: change to "EXTENSION_VERSION: 1.21.0" once 1.21.0 is released - # EXTENSION_VERSION: "1.21.0" - EXTENSION_BRANCH: "v1.x" + EXTENSION_VERSION: "1.21.0" - func: "upload extension" - name: "build-php-8.4-next-stable" tags: ["build", "php8.4", "next-stable", "pr", "tag"] @@ -31,9 +26,7 @@ tasks: PHP_VERSION: "8.4" - func: "compile extension" vars: - # TODO: change to "v1.21" once 1.21.0 is released - # EXTENSION_BRANCH: "v1.21" - EXTENSION_BRANCH: "v1.x" + EXTENSION_BRANCH: "v1.21" - func: "upload extension" - name: "build-php-8.4-next-minor" tags: ["build", "php8.4", "next-minor"] @@ -52,9 +45,6 @@ tasks: vars: PHP_VERSION: "8.3" - func: "compile extension" - # TODO: remove once 1.21.0 is released - vars: - EXTENSION_BRANCH: "v1.x" - func: "upload extension" - name: "build-php-8.3-lowest" tags: ["build", "php8.3", "lowest", "pr", "tag"] @@ -64,9 +54,7 @@ tasks: PHP_VERSION: "8.3" - func: "compile extension" vars: - # TODO: change to "EXTENSION_VERSION: 1.21.0" once 1.21.0 is released - # EXTENSION_VERSION: "1.21.0" - EXTENSION_BRANCH: "v1.x" + EXTENSION_VERSION: "1.21.0" - func: "upload extension" - name: "build-php-8.3-next-stable" tags: ["build", "php8.3", "next-stable", "pr", "tag"] @@ -76,9 +64,7 @@ tasks: PHP_VERSION: "8.3" - func: "compile extension" vars: - # TODO: change to "v1.21" once 1.21.0 is released - # EXTENSION_BRANCH: "v1.21" - EXTENSION_BRANCH: "v1.x" + EXTENSION_BRANCH: "v1.21" - func: "upload extension" - name: "build-php-8.3-next-minor" tags: ["build", "php8.3", "next-minor"] @@ -97,9 +83,6 @@ tasks: vars: PHP_VERSION: "8.2" - func: "compile extension" - # TODO: remove once 1.21.0 is released - vars: - EXTENSION_BRANCH: "v1.x" - func: "upload extension" - name: "build-php-8.2-lowest" tags: ["build", "php8.2", "lowest", "pr", "tag"] @@ -109,9 +92,7 @@ tasks: PHP_VERSION: "8.2" - func: "compile extension" vars: - # TODO: change to "EXTENSION_VERSION: 1.21.0" once 1.21.0 is released - # EXTENSION_VERSION: "1.21.0" - EXTENSION_BRANCH: "v1.x" + EXTENSION_VERSION: "1.21.0" - func: "upload extension" - name: "build-php-8.2-next-stable" tags: ["build", "php8.2", "next-stable", "pr", "tag"] @@ -121,9 +102,7 @@ tasks: PHP_VERSION: "8.2" - func: "compile extension" vars: - # TODO: change to "v1.21" once 1.21.0 is released - # EXTENSION_BRANCH: "v1.21" - EXTENSION_BRANCH: "v1.x" + EXTENSION_BRANCH: "v1.21" - func: "upload extension" - name: "build-php-8.2-next-minor" tags: ["build", "php8.2", "next-minor"] @@ -142,9 +121,6 @@ tasks: vars: PHP_VERSION: "8.1" - func: "compile extension" - # TODO: remove once 1.21.0 is released - vars: - EXTENSION_BRANCH: "v1.x" - func: "upload extension" - name: "build-php-8.1-lowest" tags: ["build", "php8.1", "lowest", "pr", "tag"] @@ -154,9 +130,7 @@ tasks: PHP_VERSION: "8.1" - func: "compile extension" vars: - # TODO: change to "EXTENSION_VERSION: 1.21.0" once 1.21.0 is released - # EXTENSION_VERSION: "1.21.0" - EXTENSION_BRANCH: "v1.x" + EXTENSION_VERSION: "1.21.0" - func: "upload extension" - name: "build-php-8.1-next-stable" tags: ["build", "php8.1", "next-stable", "pr", "tag"] @@ -166,9 +140,7 @@ tasks: PHP_VERSION: "8.1" - func: "compile extension" vars: - # TODO: change to "v1.21" once 1.21.0 is released - # EXTENSION_BRANCH: "v1.21" - EXTENSION_BRANCH: "v1.x" + EXTENSION_BRANCH: "v1.21" - 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 98da2976d..39f32d80d 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 once 1.21.0 is released - vars: - EXTENSION_BRANCH: "v1.x" - func: "upload extension" - name: "build-php-%phpVersion%-lowest" tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"] @@ -17,9 +14,7 @@ PHP_VERSION: "%phpVersion%" - func: "compile extension" vars: - # TODO: change to "EXTENSION_VERSION: 1.21.0" once 1.21.0 is released - # EXTENSION_VERSION: "1.21.0" - EXTENSION_BRANCH: "v1.x" + EXTENSION_VERSION: "1.21.0" - func: "upload extension" - name: "build-php-%phpVersion%-next-stable" tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"] @@ -29,9 +24,7 @@ PHP_VERSION: "%phpVersion%" - func: "compile extension" vars: - # TODO: change to "v1.21" once 1.21.0 is released - # EXTENSION_BRANCH: "v1.21" - EXTENSION_BRANCH: "v1.x" + EXTENSION_BRANCH: "v1.21" - 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 10bcc251d..462e4d67e 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 1.21.0 is released - # DRIVER_VERSION: "stable" - DRIVER_VERSION: "mongodb/mongo-php-driver@v1.x" + DRIVER_VERSION: "stable" jobs: phpcs: diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml index fd755509c..9b504ef34 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 1.21.0 is released - # DRIVER_VERSION: "stable" - DRIVER_VERSION: "mongodb/mongo-php-driver@v1.x" + DRIVER_VERSION: "stable" jobs: psalm: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 5a7d6fbf3..0103bdcd1 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 1.21.0 is released - # DRIVER_VERSION: "stable" - DRIVER_VERSION: "mongodb/mongo-php-driver@v1.x" + DRIVER_VERSION: "stable" jobs: psalm: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 194414fb4..36640a724 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,9 +12,7 @@ on: - "feature/*" env: - # TODO: change to "stable" once 1.21.0 is released - # DRIVER_VERSION: "stable" - DRIVER_VERSION: "mongodb/mongo-php-driver@v1.x" + DRIVER_VERSION: "stable" jobs: phpunit: From d216a5bfc62c9b63ba3523565a35856ab91f78d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Fri, 28 Feb 2025 12:14:09 +0100 Subject: [PATCH 2/2] Exclude dependabot PRs from release notes (#1616) --- .github/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/release.yml b/.github/release.yml index 1eaf6952b..34064499c 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -2,4 +2,4 @@ changelog: exclude: authors: - mongodb-php-bot - - dependabot[bot] + - dependabot