From c437ca115fc885f7115211ebc3598aa5732076da Mon Sep 17 00:00:00 2001 From: Shendy Kurnia Date: Wed, 6 Sep 2023 23:02:30 +0700 Subject: [PATCH 1/2] Revert commit 25a87d1faf16d11e0c40d9ac48f3f47263efc469 that was bumping minimum required version of WooCommerce and WP. --- .github/workflows/compatibility.yml | 7 +++---- .github/workflows/e2e-test.yml | 2 +- .github/workflows/php-lint-test.yml | 2 +- .../hotfix-revert-460-wp-wc-min-supported-version-bump | 4 ++++ phpcs-compat.xml.dist | 2 +- phpcs.xml.dist | 2 +- readme.txt | 8 ++++---- woocommerce-payments.php | 6 +++--- 8 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 changelog/hotfix-revert-460-wp-wc-min-supported-version-bump diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml index 1ec1f0eb396..4dd1d7c6512 100644 --- a/.github/workflows/compatibility.yml +++ b/.github/workflows/compatibility.yml @@ -4,10 +4,9 @@ on: pull_request env: - WC_MIN_SUPPORTED_VERSION: '7.8.0' - WP_MIN_SUPPORTED_VERSION: '6.1' + WC_MIN_SUPPORTED_VERSION: '7.6.0' + WP_MIN_SUPPORTED_VERSION: '6.0' PHP_MIN_SUPPORTED_VERSION: '7.3' - GUTENBERG_VERSION_FOR_WP_MIN: '15.7.0' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -24,7 +23,7 @@ jobs: id: generate_matrix run: | WC_VERSIONS=$( echo "[\"$WC_MIN_SUPPORTED_VERSION\", \"latest\", \"beta\"]" ) - MATRIX_INCLUDE=$( echo "[{\"woocommerce\":\"$WC_MIN_SUPPORTED_VERSION\",\"wordpress\":\"$WP_MIN_SUPPORTED_VERSION\",\"gutenberg\":\"$GUTENBERG_VERSION_FOR_WP_MIN\",\"php\":\"$PHP_MIN_SUPPORTED_VERSION\"}]" ) + MATRIX_INCLUDE=$( echo "[{\"woocommerce\":\"$WC_MIN_SUPPORTED_VERSION\",\"wordpress\":\"$WP_MIN_SUPPORTED_VERSION\",\"gutenberg\":\"13.6.0\",\"php\":\"$PHP_MIN_SUPPORTED_VERSION\"}]" ) echo "matrix={\"woocommerce\":$WC_VERSIONS,\"wordpress\":[\"latest\"],\"gutenberg\":[\"latest\"],\"php\":[\"7.4\"], \"include\":$MATRIX_INCLUDE}" >> $GITHUB_OUTPUT woocommerce-compatibility: diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 41b5037019f..11cc17bafab 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -23,7 +23,7 @@ env: E2E_SLACK_TOKEN: ${{ secrets.E2E_SLACK_TOKEN }} E2E_USE_LOCAL_SERVER: false E2E_RESULT_FILEPATH: 'tests/e2e/results.json' - WC_MIN_SUPPORTED_VERSION: '7.8.0' + WC_MIN_SUPPORTED_VERSION: '7.6.0' NODE_ENV: 'test' FORCE_E2E_DEPS_SETUP: true diff --git a/.github/workflows/php-lint-test.yml b/.github/workflows/php-lint-test.yml index b0d5448aab2..0399a22735c 100644 --- a/.github/workflows/php-lint-test.yml +++ b/.github/workflows/php-lint-test.yml @@ -6,7 +6,7 @@ on: env: WP_VERSION: latest - WC_MIN_SUPPORTED_VERSION: '7.8.0' + WC_MIN_SUPPORTED_VERSION: '7.6.0' GUTENBERG_VERSION: latest PHP_MIN_SUPPORTED_VERSION: '7.3' diff --git a/changelog/hotfix-revert-460-wp-wc-min-supported-version-bump b/changelog/hotfix-revert-460-wp-wc-min-supported-version-bump new file mode 100644 index 00000000000..cbab497c932 --- /dev/null +++ b/changelog/hotfix-revert-460-wp-wc-min-supported-version-bump @@ -0,0 +1,4 @@ +Significance: minor +Type: dev + +Revert bumping minimum required version of WooCommerce to 7.8.0 and WP to 6.0 diff --git a/phpcs-compat.xml.dist b/phpcs-compat.xml.dist index 6755f7ce080..996f8374292 100644 --- a/phpcs-compat.xml.dist +++ b/phpcs-compat.xml.dist @@ -15,7 +15,7 @@ tests/ - + diff --git a/phpcs.xml.dist b/phpcs.xml.dist index feb1aeb900a..9f8efd70ee5 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -16,7 +16,7 @@ ./lib/* - + diff --git a/readme.txt b/readme.txt index b3d4eb8c091..5df06e86f5e 100644 --- a/readme.txt +++ b/readme.txt @@ -1,8 +1,8 @@ === WooPayments - Fully Integrated Solution Built and Supported by Woo === Contributors: woocommerce, automattic Tags: payment gateway, payment, apple pay, credit card, google pay, woocommerce payments -Requires at least: 6.1 -Tested up to: 6.3 +Requires at least: 6.0 +Tested up to: 6.2 Requires PHP: 7.3 Stable tag: 6.4.1 License: GPLv2 or later @@ -38,8 +38,8 @@ Our global support team is available to answer questions you may have about WooP = Requirements = -* WordPress 6.1 or newer. -* WooCommerce 7.8 or newer. +* WordPress 6.0 or newer. +* WooCommerce 7.6 or newer. * PHP 7.3 or newer is recommended. = Try it now = diff --git a/woocommerce-payments.php b/woocommerce-payments.php index 1fcc393d0d4..47198f4131a 100644 --- a/woocommerce-payments.php +++ b/woocommerce-payments.php @@ -8,9 +8,9 @@ * Woo: 5278104:bf3cf30871604e15eec560c962593c1f * Text Domain: woocommerce-payments * Domain Path: /languages - * WC requires at least: 7.8 - * WC tested up to: 8.0.0 - * Requires at least: 6.1 + * WC requires at least: 7.6 + * WC tested up to: 7.8.0 + * Requires at least: 6.0 * Requires PHP: 7.3 * Version: 6.4.1 * From 70af0eed49f6d292fac8adb7db5b8b3a6a0d6bb3 Mon Sep 17 00:00:00 2001 From: Shendy Kurnia Date: Thu, 7 Sep 2023 00:31:16 +0700 Subject: [PATCH 2/2] Make changelog entries more clear by preserving the changelog entry we are reverting and clearly stating the minimum required WC and WP version now. --- changelog/hotfix-revert-460-wp-wc-min-supported-version-bump | 2 +- .../hotfix-revert-460-wp-wc-min-supported-version-bump-2 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelog/hotfix-revert-460-wp-wc-min-supported-version-bump-2 diff --git a/changelog/hotfix-revert-460-wp-wc-min-supported-version-bump b/changelog/hotfix-revert-460-wp-wc-min-supported-version-bump index cbab497c932..7135006707b 100644 --- a/changelog/hotfix-revert-460-wp-wc-min-supported-version-bump +++ b/changelog/hotfix-revert-460-wp-wc-min-supported-version-bump @@ -1,4 +1,4 @@ Significance: minor Type: dev -Revert bumping minimum required version of WooCommerce to 7.8.0 and WP to 6.0 +Revert - Bump minimum required version of WooCommerce to 8.0.0 and WP to 6.1 diff --git a/changelog/hotfix-revert-460-wp-wc-min-supported-version-bump-2 b/changelog/hotfix-revert-460-wp-wc-min-supported-version-bump-2 new file mode 100644 index 00000000000..60274276bf9 --- /dev/null +++ b/changelog/hotfix-revert-460-wp-wc-min-supported-version-bump-2 @@ -0,0 +1,4 @@ +Significance: minor +Type: dev + +Setting the minimum required version of WooCommerce back to 7.8.0 and WP to 6.0