Skip to content

Commit

Permalink
Merge branch 'trunk' into 710-check-look-for-duplicated-filenames
Browse files Browse the repository at this point in the history
  • Loading branch information
davidperezgar authored Jan 3, 2025
2 parents 9a83c79 + 4099e4d commit 602d351
Show file tree
Hide file tree
Showing 51 changed files with 3,763 additions and 2,219 deletions.
2 changes: 0 additions & 2 deletions .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
.idea
.wordpress-org
build
build-cs
build-phpunit
docs
node_modules
patches
Expand Down
6 changes: 0 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,3 @@ updates:
schedule:
interval: weekly
open-pull-requests-limit: 10

- package-ecosystem: composer
directory: '/build-phpunit'
schedule:
interval: weekly
open-pull-requests-limit: 10
8 changes: 3 additions & 5 deletions .github/workflows/behat-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,14 @@ jobs:
- '7.4'
- '8.0'
- '8.1'
- '8.2'
wordpress: [ 'latest' ]
include:
- php: '8.2'
- php: '8.3'
wordpress: 'latest'
coverage: true
- php: '7.4'
wordpress: '6.3'
- php: '8.3'
wordpress: 'trunk'
experimental: true
- php: '8.4'
wordpress: 'trunk'
experimental: true
Expand Down Expand Up @@ -155,7 +153,7 @@ jobs:
- name: Upload code coverage report
if: ${{ matrix.coverage }}
uses: codecov/codecov-action@v5.0.2
uses: codecov/codecov-action@v5.1.2
with:
files: ${{ steps.coverage_files.outputs.files }}
flags: feature
Expand Down
31 changes: 30 additions & 1 deletion .github/workflows/php-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

- uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: 'latest'

- name: Validate Composer configuration
run: composer validate
Expand All @@ -61,3 +61,32 @@ jobs:

- name: PHPMD
run: composer phpmd

php-lint-sniffs:
name: PHP (Sniffs)
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: actions/checkout@v4

- uses: shivammathur/setup-php@v2
with:
php-version: '8.0'

- name: Validate Composer configuration
working-directory: "phpcs-sniffs"
run: composer validate

- name: Install PHP dependencies
uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a
with:
composer-options: '--prefer-dist'
working-directory: "phpcs-sniffs"

- name: PHP Lint
working-directory: "phpcs-sniffs"
run: composer lint

- name: PHP Lint PHPCS
working-directory: "phpcs-sniffs"
run: composer check-cs
12 changes: 9 additions & 3 deletions .github/workflows/php-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,12 @@ jobs:
- '7.4'
- '8.0'
- '8.1'
- '8.2'
wordpress: [ 'latest' ]
include:
- php: '7.4'
wordpress: '6.3'
- php: '8.2'
- php: '8.3'
wordpress: 'latest'
coverage: true
- php: '8.3'
Expand All @@ -71,6 +72,11 @@ jobs:
with:
php-version: ${{ matrix.php }}

- name: Install PHP dependencies
uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a
with:
composer-options: '--prefer-dist'

- name: Setup Node.js (.nvmrc)
uses: actions/setup-node@v4
with:
Expand Down Expand Up @@ -100,7 +106,7 @@ jobs:
- name: Upload code coverage report
if: ${{ matrix.coverage }}
uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303
with:
file: build/logs/*.xml
flags: unit
Expand Down Expand Up @@ -146,7 +152,7 @@ jobs:
- name: Upload code coverage report
if: ${{ matrix.coverage }}
uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303
with:
file: build/logs/*.xml
flags: phpcs-sniffs
Expand Down
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ build
############

node_modules/
vendor/
build-cs/vendor/
build-cs/composer.lock
build-phpunit/vendor/
build-phpunit/composer.lock
/vendor/

############
## OSes
Expand Down
6 changes: 0 additions & 6 deletions build-phpunit/composer.json

This file was deleted.

6 changes: 4 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"require": {
"php": ">=7.4",
"ext-json": "*",
"afragen/wordpress-plugin-readme-parser": "dev-master#67fba498d0b112acf84386b95e4905c539a33f0b",
"afragen/wordpress-plugin-readme-parser": "dev-master#c3758599348148be684b3c4ad1105d09b6230d51",
"automattic/vipwpcs": "^3.0.0",
"composer/installers": "^2.2",
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
Expand All @@ -25,7 +25,9 @@
"wp-cli/wp-cli-tests": "^4.2.9",
"wp-cli/language-command": "^2.0",
"wp-cli/i18n-command": "^2.6",
"wp-cli/entity-command": "^2.8"
"wp-cli/entity-command": "^2.8",
"wp-phpunit/wp-phpunit": "^6.3",
"yoast/phpunit-polyfills": "^1.0"
},
"repositories": [
{
Expand Down
Loading

0 comments on commit 602d351

Please sign in to comment.