Skip to content

Commit 445cb66

Browse files
committed
Merge release/5.9.0 into trunk
2 parents 218b3e0 + 8a05000 commit 445cb66

File tree

404 files changed

+61876
-47832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

404 files changed

+61876
-47832
lines changed

.github/actions/e2e/env-setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ runs:
2020
# Composer setup
2121
- name: Setup Composer
2222
shell: bash
23-
run: composer self-update 2.0.6
23+
run: composer self-update
2424

2525
# Use node version from .nvmrc
2626
- name: Setup NodeJS

.github/dependabot.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,23 @@ updates:
44
- package-ecosystem: 'npm'
55
# Look for `package.json` and `lock` files in the `root` directory
66
directory: '/'
7-
# Check the npm registry for updates every day (weekdays)
7+
# Check for updates once a week
88
schedule:
99
interval: 'weekly'
10+
ignore:
11+
# For @wordpress dependencies, ignore all updates as most of them need to be synced to the min WP version
12+
- dependency-name: "@wordpress/*"
13+
# For @woocommerce dependencies, ignore all updates as most of them need to be synced to the min WC version
14+
- dependency-name: "@woocommerce/*"
1015
# Reviewers for issues created
1116
reviewers:
12-
- 'Automattic/harmony'
17+
- 'Automattic/harmony'
1318

1419
# Enable version updates for composer
1520
- package-ecosystem: 'composer'
1621
# Look for `package.json` and `lock` files in the `root` directory
1722
directory: '/'
18-
# Check the npm registry for updates every day (weekdays)
23+
# Check for updates once a week
1924
schedule:
2025
interval: 'weekly'
2126
# Reviewers for issues created

.github/workflows/check-changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
tools: composer
2929
coverage: none
3030
# Install composer packages.
31-
- run: composer self-update 2.0.6 && composer install --no-progress
31+
- run: composer self-update && composer install --no-progress
3232
# Fetch the target branch before running the check.
3333
- name: Fetch the target origin branch
3434
run: git fetch origin $GITHUB_BASE_REF

.github/workflows/compatibility.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
pull_request
55

66
env:
7-
WC_MIN_SUPPORTED_VERSION: '7.4.1'
7+
WC_MIN_SUPPORTED_VERSION: '7.5.0'
88
WP_MIN_SUPPORTED_VERSION: '6.0'
9-
PHP_MIN_SUPPORTED_VERSION: '7.2'
9+
PHP_MIN_SUPPORTED_VERSION: '7.3'
1010

1111
concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/e2e-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env:
2323
E2E_SLACK_TOKEN: ${{ secrets.E2E_SLACK_TOKEN }}
2424
E2E_USE_LOCAL_SERVER: false
2525
E2E_RESULT_FILEPATH: 'tests/e2e/results.json'
26-
WC_MIN_SUPPORTED_VERSION: '7.4.1'
26+
WC_MIN_SUPPORTED_VERSION: '7.5.0'
2727
NODE_ENV: 'test'
2828

2929
jobs:

.github/workflows/php-lint-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ on:
66

77
env:
88
WP_VERSION: latest
9-
WC_MIN_SUPPORTED_VERSION: '7.4.1'
9+
WC_MIN_SUPPORTED_VERSION: '7.5.0'
1010
GUTENBERG_VERSION: latest
11-
PHP_MIN_SUPPORTED_VERSION: '7.2'
11+
PHP_MIN_SUPPORTED_VERSION: '7.3'
1212

1313
concurrency:
1414
group: ${{ github.workflow }}-${{ github.ref }}
@@ -33,7 +33,7 @@ jobs:
3333
tools: composer
3434
coverage: none
3535
# install dependencies and run linter
36-
- run: composer self-update 2.0.6 && composer install --no-progress && ./vendor/bin/phpcs --standard=phpcs.xml.dist $(git ls-files | grep .php$) && ./vendor/bin/psalm
36+
- run: composer self-update && composer install --no-progress && ./vendor/bin/phpcs --standard=phpcs.xml.dist $(git ls-files | grep .php$) && ./vendor/bin/psalm
3737

3838
generate-test-matrix:
3939
name: "Generate the matrix for php tests dynamically"
@@ -46,7 +46,7 @@ jobs:
4646
run: |
4747
PHP_VERSIONS=$( echo "[\"$PHP_MIN_SUPPORTED_VERSION\", \"7.3\", \"7.4\"]" )
4848
echo "matrix={\"php\":$PHP_VERSIONS}" >> $GITHUB_OUTPUT
49-
49+
5050
test:
5151
name: PHP testing
5252
needs: generate-test-matrix
14.5 KB
Loading
Lines changed: 1 addition & 0 deletions
Loading

bin/check-test-coverage.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
echo "Installing the test environment..."
6+
7+
docker-compose exec -u www-data wordpress \
8+
/var/www/html/wp-content/plugins/woocommerce-payments/bin/install-wp-tests.sh
9+
10+
echo "Checking coverage..."
11+
12+
docker-compose exec -u www-data wordpress \
13+
php -d xdebug.remote_autostart=on \
14+
/var/www/html/wp-content/plugins/woocommerce-payments/vendor/bin/phpunit \
15+
--configuration /var/www/html/wp-content/plugins/woocommerce-payments/phpunit.xml.dist \
16+
--coverage-html /var/www/html/php-test-coverage
17+
$*

bin/run-ci-tests-check-coverage.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ IFS=$'\n\t'
77
# set environment variables
88
WCPAY_DIR="$GITHUB_WORKSPACE"
99

10-
composer self-update 2.0.6 && composer install --no-progress
10+
composer self-update && composer install --no-progress
1111
sudo systemctl start mysql.service
1212
bash bin/install-wp-tests.sh woocommerce_test root root localhost $WP_VERSION $WC_VERSION false
1313
echo 'Running the tests...'

0 commit comments

Comments
 (0)