Skip to content

Commit 672823b

Browse files
crstaufcrstauf
committed
Merge branch 'develop' into more-conditionals
2 parents 4613771 + a7e2f46 commit 672823b

32 files changed

+445
-199
lines changed

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ insert_final_newline = true
77
trim_trailing_whitespace = true
88
indent_style = tab
99

10-
[*.yml]
10+
[{*.yml,*.toml}]
1111
indent_style = space
1212
indent_size = 2
1313

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
/CODE_OF_CONDUCT.md export-ignore
2323
/CONTRIBUTING.md export-ignore
2424
/docker-compose.yml export-ignore
25+
/netlify.toml export-ignore
2526
/package-lock.json export-ignore
2627
/package.json export-ignore
2728
/phpcs.xml.dist export-ignore

‎.github/workflows/acceptance-tests.yml

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- 'trunk'
99
- 'master'
1010
paths:
11-
- '.github/**'
11+
- '.github/workflows/acceptance-tests.yml'
1212
- 'tests/**'
1313
- '**.css'
1414
- '**.scss'
@@ -22,7 +22,7 @@ on:
2222
branches:
2323
- '**'
2424
paths:
25-
- '.github/**'
25+
- '.github/workflows/acceptance-tests.yml'
2626
- 'tests/**'
2727
- '**.css'
2828
- '**.scss'
@@ -32,48 +32,27 @@ on:
3232
- 'composer.json'
3333
- 'docker-compose.yml'
3434
- 'package.json'
35-
schedule:
36-
# Once weekly on Thursdays at 04:00 UTC.
37-
#
38-
# ┌───────────── minute (0 - 59)
39-
# │ ┌────────── hour (0 - 23)
40-
# │ │ ┌─────── day of the month (1 - 31)
41-
# │ │ │ ┌──── month (1 - 12 or JAN-DEC)
42-
# │ │ │ │ ┌─ day of the week (0 - 6 or SUN-SAT)
43-
# │ │ │ │ │
44-
# │ │ │ │ │
45-
# │ │ │ │ │
46-
- cron: '0 4 * * 4'
4735
workflow_dispatch:
4836

4937
jobs:
5038
test:
5139
name: WP ${{ matrix.wp }} / PHP ${{ matrix.php }}
5240
strategy:
53-
# See the following for PHP Compatibility of WordPress versions:
41+
# See the following for PHP compatibility of WordPress versions:
5442
# https://make.wordpress.org/core/handbook/references/php-compatibility-and-wordpress-versions/
5543
matrix:
5644
wp:
57-
# Nightly:
58-
- 'nightly'
5945
# Latest three stable:
6046
- '6.4'
6147
- '6.3'
6248
- '6.2'
6349
php:
64-
- '8.0'
50+
- '8.2'
6551
- '7.4'
6652
include:
67-
# Latest stable on PHP 8.1 and 8.2:
53+
# Latest stable on PHP 8.3:
6854
- wp: '6.4'
69-
php: '8.1'
70-
- wp: '6.4'
71-
php: '8.2'
72-
# Nightly on PHP 8.1 and 8.2:
73-
- wp: 'nightly'
74-
php: '8.1'
75-
- wp: 'nightly'
76-
php: '8.2'
55+
php: '8.3'
7756
# Oldest supported on PHP 7.4:
7857
- wp: '5.6'
7958
php: '7.4'

‎.github/workflows/coding-standards.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- 'trunk'
99
- 'master'
1010
paths:
11-
- '.github/**'
11+
- '.github/workflows/coding-standards.yml'
1212
- '**.css'
1313
- '**.scss'
1414
- '**.js'
@@ -22,7 +22,7 @@ on:
2222
branches:
2323
- '**'
2424
paths:
25-
- '.github/**'
25+
- '.github/workflows/coding-standards.yml'
2626
- '**.css'
2727
- '**.scss'
2828
- '**.js'
@@ -32,18 +32,6 @@ on:
3232
- 'phpcs.xml.dist'
3333
- 'phpcs56.yml'
3434
- 'phpstan.neon.dist'
35-
schedule:
36-
# Once weekly on Thursdays at 03:00 UTC.
37-
#
38-
# ┌───────────── minute (0 - 59)
39-
# │ ┌────────── hour (0 - 23)
40-
# │ │ ┌─────── day of the month (1 - 31)
41-
# │ │ │ ┌──── month (1 - 12 or JAN-DEC)
42-
# │ │ │ │ ┌─ day of the week (0 - 6 or SUN-SAT)
43-
# │ │ │ │ │
44-
# │ │ │ │ │
45-
# │ │ │ │ │
46-
- cron: '0 3 * * 4'
4735
workflow_dispatch:
4836

4937
jobs:
@@ -54,8 +42,6 @@ jobs:
5442
matrix:
5543
php:
5644
- '8.2'
57-
- '8.1'
58-
- '8.0'
5945
- '7.4'
6046
fail-fast: false
6147
with:

‎.github/workflows/deploy-docs.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎.github/workflows/integration-tests.yml

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- 'trunk'
99
- 'master'
1010
paths:
11-
- '.github/**'
11+
- '.github/workflows/integration-tests.yml'
1212
- 'tests/**'
1313
- '**.css'
1414
- '**.scss'
@@ -22,7 +22,7 @@ on:
2222
branches:
2323
- '**'
2424
paths:
25-
- '.github/**'
25+
- '.github/workflows/integration-tests.yml'
2626
- 'tests/**'
2727
- '**.css'
2828
- '**.scss'
@@ -32,49 +32,28 @@ on:
3232
- 'composer.json'
3333
- 'docker-compose.yml'
3434
- 'package.json'
35-
schedule:
36-
# Once weekly on Thursdays at 05:00 UTC.
37-
#
38-
# ┌───────────── minute (0 - 59)
39-
# │ ┌────────── hour (0 - 23)
40-
# │ │ ┌─────── day of the month (1 - 31)
41-
# │ │ │ ┌──── month (1 - 12 or JAN-DEC)
42-
# │ │ │ │ ┌─ day of the week (0 - 6 or SUN-SAT)
43-
# │ │ │ │ │
44-
# │ │ │ │ │
45-
# │ │ │ │ │
46-
- cron: '0 5 * * 4'
4735
workflow_dispatch:
4836

4937
jobs:
5038
test:
5139
name: WP ${{ matrix.wp }} / PHP ${{ matrix.php }}
5240
uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-integration-tests.yml@trunk
5341
strategy:
54-
# See the following for PHP Compatibility of WordPress versions:
42+
# See the following for PHP compatibility of WordPress versions:
5543
# https://make.wordpress.org/core/handbook/references/php-compatibility-and-wordpress-versions/
5644
matrix:
5745
wp:
58-
# Nightly:
59-
- 'nightly'
6046
# Latest three stable:
6147
- '6.4'
6248
- '6.3'
6349
- '6.2'
6450
php:
65-
- '8.0'
51+
- '8.2'
6652
- '7.4'
6753
include:
68-
# Latest stable on PHP 8.1 and 8.2:
54+
# Latest stable on PHP 8.3:
6955
- wp: '6.4'
70-
php: '8.1'
71-
- wp: '6.4'
72-
php: '8.2'
73-
# Nightly on PHP 8.1 and 8.2:
74-
- wp: 'nightly'
75-
php: '8.1'
76-
- wp: 'nightly'
77-
php: '8.2'
56+
php: '8.3'
7857
# Oldest supported on PHP 7.4:
7958
- wp: '5.6'
8059
php: '7.4'

‎.github/workflows/nightly-tests.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow
2+
3+
name: Nightly Tests
4+
on:
5+
schedule:
6+
# Once weekly on Thursdays at 05:00 UTC.
7+
#
8+
# ┌───────────── minute (0 - 59)
9+
# │ ┌────────── hour (0 - 23)
10+
# │ │ ┌─────── day of the month (1 - 31)
11+
# │ │ │ ┌──── month (1 - 12 or JAN-DEC)
12+
# │ │ │ │ ┌─ day of the week (0 - 6 or SUN-SAT)
13+
# │ │ │ │ │
14+
# │ │ │ │ │
15+
# │ │ │ │ │
16+
- cron: '0 5 * * 4'
17+
push:
18+
branches:
19+
- 'develop'
20+
paths:
21+
- '.github/workflows/nightly-tests.yml'
22+
workflow_dispatch:
23+
24+
jobs:
25+
acceptance:
26+
name: Nightly acceptance / PHP ${{ matrix.php }}
27+
strategy:
28+
matrix:
29+
php:
30+
- '8.3'
31+
- '7.4'
32+
fail-fast: false
33+
uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-acceptance-tests.yml@trunk
34+
with:
35+
wp: 'nightly'
36+
php: ${{ matrix.php }}
37+
integration:
38+
name: Nightly integration / PHP ${{ matrix.php }}
39+
uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-integration-tests.yml@trunk
40+
strategy:
41+
matrix:
42+
php:
43+
- '8.3'
44+
- '7.4'
45+
fail-fast: false
46+
with:
47+
wp: 'nightly'
48+
php: ${{ matrix.php }}

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,8 @@ See also my list of [WordPress Developer Plugins](https://johnblackbourn.com/wor
307307

308308
### Other tools
309309

310+
* [Query Monitor WordPress Snippets for VS Code](https://marketplace.visualstudio.com/items?itemName=eduwass.query-monitor-wordpress-snippets)
311+
* [Buggregator](https://buggregator.dev/)
310312
* [Clockwork](https://underground.works/clockwork/)
311313
* [Meminfo](https://github.com/BitOne/php-meminfo)
312314
* [memprof](https://github.com/arnaud-lb/php-memory-profiler)
@@ -315,6 +317,7 @@ See also my list of [WordPress Developer Plugins](https://johnblackbourn.com/wor
315317
* [Ray](https://myray.app/)
316318
* [Reli](https://github.com/reliforp/reli-prof)
317319
* [SPX](https://github.com/NoiseByNorthwest/php-spx)
320+
* [Tinkerwell](https://tinkerwell.app/)
318321
* [Xdebug](https://xdebug.org/)
319322
* [XHProf](https://tideways.com/profiler/xhprof-for-php7)
320323
* [Wonolog](https://github.com/inpsyde/Wonolog)

0 commit comments

Comments
 (0)