Skip to content

Commit

Permalink
Merge branch 'trunk' into improve/od-debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
westonruter authored Dec 13, 2024
2 parents b06b054 + 6fbbaae commit f2c6cb7
Show file tree
Hide file tree
Showing 108 changed files with 4,758 additions and 726 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/php-test-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
coverage: [false]
include:
- php: '7.4'
wp: '6.5'
wp: '6.6'
- php: '8.3'
wp: 'trunk'
- php: '8.2'
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
fi
- name: Upload single site coverage reports to Codecov
if: ${{ matrix.coverage == true }}
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: coverage-${{ github.sha }}.xml
Expand All @@ -96,7 +96,7 @@ jobs:
fail_ci_if_error: true
- name: Upload multisite coverage reports to Codecov
if: ${{ matrix.coverage == true }}
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: coverage-multisite-${{ github.sha }}.xml
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ nbproject/
build
.wp-env.override.json
*.min.js
*.min.css
*.asset.php

############
Expand Down
5 changes: 5 additions & 0 deletions .wp-env.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
"./plugins/webp-uploads"
],
"env": {
"development": {
"config": {
"WP_DEVELOPMENT_MODE": "plugin"
}
},
"tests": {
"config": {
"FS_METHOD": "direct"
Expand Down
57 changes: 29 additions & 28 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f2c6cb7

Please sign in to comment.