From 843f1837d14393327c96b613f7d9ad2a6fc9c014 Mon Sep 17 00:00:00 2001 From: Dharmesh Patel Date: Thu, 13 Feb 2025 13:06:34 +0530 Subject: [PATCH 1/4] Readme updates. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1354024..7d69a3f 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,8 @@ Properly connected GoCardless configuration: ### Requirements - PHP: 7.4+ -- WordPress: 6.3+ -- WooCommerce: 8.7+ +- WordPress: 6.5+ +- WooCommerce: 9.4+ - Node: v20 - NPM: v10 From 44341d597abb837fcf3b0c76742089ada8de9368 Mon Sep 17 00:00:00 2001 From: Dharmesh Patel Date: Thu, 13 Feb 2025 14:18:43 +0530 Subject: [PATCH 2/4] Fix the QIT Woo E2E tests and add new PHPCompat and Malware tests. --- .github/workflows/qit.yml | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/.github/workflows/qit.yml b/.github/workflows/qit.yml index 43c4377..7824056 100644 --- a/.github/workflows/qit.yml +++ b/.github/workflows/qit.yml @@ -14,7 +14,9 @@ on: - api - e2e - phpstan + - phpcompat - security + - malware pull_request: types: [opened, synchronize, reopened, labeled] branches: @@ -26,11 +28,11 @@ permissions: jobs: build: - if: "${{ ( inputs.test != '' && inputs.test != 'none' ) || contains(github.event.pull_request.labels.*.name, 'needs: qit default tests') || contains(github.event.pull_request.labels.*.name, 'needs: qit activation test') || contains(github.event.pull_request.labels.*.name, 'needs: qit api test') || contains(github.event.pull_request.labels.*.name, 'needs: qit e2e test') || contains(github.event.pull_request.labels.*.name, 'needs: qit phpstan test') || contains(github.event.pull_request.labels.*.name, 'needs: qit security test') }}" + if: "${{ ( inputs.test != '' && inputs.test != 'none' ) || contains(github.event.pull_request.labels.*.name, 'needs: qit default tests') || contains(github.event.pull_request.labels.*.name, 'needs: qit activation test') || contains(github.event.pull_request.labels.*.name, 'needs: qit api test') || contains(github.event.pull_request.labels.*.name, 'needs: qit e2e test') || contains(github.event.pull_request.labels.*.name, 'needs: qit phpstan test') || contains(github.event.pull_request.labels.*.name, 'needs: qit phpcompat test') || contains(github.event.pull_request.labels.*.name, 'needs: qit security test') || contains(github.event.pull_request.labels.*.name, 'needs: qit malware test') }}" uses: gocardless/woocommerce-gateway-gocardless/.github/workflows/generate-zip.yml@develop test: - if: "${{ ( inputs.test != '' && inputs.test != 'none' ) || contains(github.event.pull_request.labels.*.name, 'needs: qit default tests') || contains(github.event.pull_request.labels.*.name, 'needs: qit activation test') || contains(github.event.pull_request.labels.*.name, 'needs: qit api test') || contains(github.event.pull_request.labels.*.name, 'needs: qit e2e test') || contains(github.event.pull_request.labels.*.name, 'needs: qit phpstan test') || contains(github.event.pull_request.labels.*.name, 'needs: qit security test') }}" + if: "${{ ( inputs.test != '' && inputs.test != 'none' ) || contains(github.event.pull_request.labels.*.name, 'needs: qit default tests') || contains(github.event.pull_request.labels.*.name, 'needs: qit activation test') || contains(github.event.pull_request.labels.*.name, 'needs: qit api test') || contains(github.event.pull_request.labels.*.name, 'needs: qit e2e test') || contains(github.event.pull_request.labels.*.name, 'needs: qit phpstan test') || contains(github.event.pull_request.labels.*.name, 'needs: qit phpcompat test') || contains(github.event.pull_request.labels.*.name, 'needs: qit security test') || contains(github.event.pull_request.labels.*.name, 'needs: qit malware test') }}" needs: build name: run runs-on: ubuntu-latest @@ -79,7 +81,7 @@ jobs: - name: Run API test if: "${{ ( ( inputs.tests == 'default' || inputs.tests == 'api' ) || contains(github.event.pull_request.labels.*.name, 'needs: qit default tests') || contains(github.event.pull_request.labels.*.name, 'needs: qit api test') ) && ( success() || failure() ) }}" id: run-api-test - run: ./vendor/bin/qit run:api ${{ github.event.repository.name }} --zip=${{ github.event.repository.name }}.zip --wait > api-result.txt + run: ./vendor/bin/qit run:woo-api ${{ github.event.repository.name }} --zip=${{ github.event.repository.name }}.zip --wait > api-result.txt - uses: marocchino/sticky-pull-request-comment@v2 if: ${{ failure() && steps.run-api-test.conclusion == 'failure' }} @@ -91,7 +93,7 @@ jobs: - name: Run E2E test if: "${{ ( ( inputs.tests == 'default' || inputs.tests == 'e2e' ) || contains(github.event.pull_request.labels.*.name, 'needs: qit default tests') || contains(github.event.pull_request.labels.*.name, 'needs: qit e2e test') ) && ( success() || failure() ) }}" id: run-e2e-test - run: ./vendor/bin/qit run:e2e ${{ github.event.repository.name }} --zip=${{ github.event.repository.name }}.zip --wait > e2e-result.txt + run: ./vendor/bin/qit run:woo-e2e ${{ github.event.repository.name }} --zip=${{ github.event.repository.name }}.zip --wait > e2e-result.txt - uses: marocchino/sticky-pull-request-comment@v2 if: ${{ failure() && steps.run-e2e-test.conclusion == 'failure' }} @@ -112,6 +114,18 @@ jobs: recreate: true path: phpstan-result.txt + - name: Run PHPCompat test + if: "${{ inputs.tests == 'phpcompat' || contains(github.event.pull_request.labels.*.name, 'needs: qit phpcompat test') && ( success() || failure() ) }}" + id: run-phpcompat-test + run: ./vendor/bin/qit run:phpcompatibility ${{ github.event.repository.name }} --zip=${{ github.event.repository.name }}.zip --wait > phpcompat-result.txt + + - uses: marocchino/sticky-pull-request-comment@v2 + if: ${{ failure() && steps.run-phpcompat-test.conclusion == 'failure' }} + with: + header: QIT PHPCompat result + recreate: true + path: phpcompat-result.txt + - name: Run security test if: "${{ inputs.tests == 'security' || contains(github.event.pull_request.labels.*.name, 'needs: qit security test') && ( success() || failure() ) }}" id: run-security-test @@ -123,3 +137,15 @@ jobs: header: QIT security result recreate: true path: security-result.txt + + - name: Run malware test + if: "${{ inputs.tests == 'malware' || contains(github.event.pull_request.labels.*.name, 'needs: qit malware test') && ( success() || failure() ) }}" + id: run-malware-test + run: ./vendor/bin/qit run:malware ${{ github.event.repository.name }} --zip=${{ github.event.repository.name }}.zip --wait > malware-result.txt + + - uses: marocchino/sticky-pull-request-comment@v2 + if: ${{ failure() && steps.run-malware-test.conclusion == 'failure' }} + with: + header: QIT malware result + recreate: true + path: malware-result.txt From 9e73b925e88845ac68995fb3882e3a87b33318e1 Mon Sep 17 00:00:00 2001 From: Dharmesh Patel Date: Thu, 13 Feb 2025 15:11:53 +0530 Subject: [PATCH 3/4] Add config file for WP version checker. --- .distignore | 1 + .wordpress-version-checker.json | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 .wordpress-version-checker.json diff --git a/.distignore b/.distignore index b4223d3..048908c 100644 --- a/.distignore +++ b/.distignore @@ -19,3 +19,4 @@ /phpunit.xml.dist /README.md /webpack.config.js +/.wordpress-version-checker.json diff --git a/.wordpress-version-checker.json b/.wordpress-version-checker.json new file mode 100644 index 0000000..9aa58aa --- /dev/null +++ b/.wordpress-version-checker.json @@ -0,0 +1,4 @@ +{ + "readme": "readme.txt", + "channel": "rc" +} From 558fe47f2e2c3c3bd6b64fd056eefa65c042953a Mon Sep 17 00:00:00 2001 From: Dharmesh Patel Date: Thu, 13 Feb 2025 19:56:52 +0530 Subject: [PATCH 4/4] Remove unnecessary exclude. --- .distignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.distignore b/.distignore index 048908c..b4223d3 100644 --- a/.distignore +++ b/.distignore @@ -19,4 +19,3 @@ /phpunit.xml.dist /README.md /webpack.config.js -/.wordpress-version-checker.json