Skip to content

Commit d38b49b

Browse files
committed
Merge branch 'trunk' into 62221-hardening
2 parents 30090af + 0f2334d commit d38b49b

24 files changed

+221
-110
lines changed

.github/workflows/coding-standards.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,22 @@ jobs:
4949
# Runs the PHP coding standards checks.
5050
phpcs:
5151
name: PHP coding standards
52-
uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-php.yml@trunk
52+
uses: ./.github/workflows/reusable-coding-standards-php.yml
5353
permissions:
5454
contents: read
5555
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
5656

5757
# Runs the JavaScript coding standards checks.
5858
jshint:
5959
name: JavaScript coding standards
60-
uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-javascript.yml@trunk
60+
uses: ./.github/workflows/reusable-coding-standards-javascript.yml
6161
permissions:
6262
contents: read
6363
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
6464

6565
slack-notifications:
6666
name: Slack Notifications
67-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
67+
uses: ./.github/workflows/slack-notifications.yml
6868
permissions:
6969
actions: read
7070
contents: read

.github/workflows/end-to-end-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
# Runs the end-to-end test suite.
3939
e2e-tests:
4040
name: Test with SCRIPT_DEBUG ${{ matrix.LOCAL_SCRIPT_DEBUG && 'enabled' || 'disabled' }}
41-
uses: WordPress/wordpress-develop/.github/workflows/reusable-end-to-end-tests.yml@trunk
41+
uses: ./.github/workflows/reusable-end-to-end-tests.yml
4242
permissions:
4343
contents: read
4444
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
@@ -51,7 +51,7 @@ jobs:
5151

5252
slack-notifications:
5353
name: Slack Notifications
54-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
54+
uses: ./.github/workflows/slack-notifications.yml
5555
permissions:
5656
actions: read
5757
contents: read

.github/workflows/install-testing.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
# Determines the supported values for PHP and database versions based on the WordPress version being tested.
4444
build-test-matrix:
4545
name: Build Test Matrix
46-
uses: WordPress/wordpress-develop/.github/workflows/reusable-support-json-reader-v1.yml@trunk
46+
uses: ./.github/workflows/reusable-support-json-reader-v1.yml
4747
permissions:
4848
contents: read
4949
secrets: inherit
@@ -136,7 +136,7 @@ jobs:
136136

137137
slack-notifications:
138138
name: Slack Notifications
139-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
139+
uses: ./.github/workflows/slack-notifications.yml
140140
permissions:
141141
actions: read
142142
contents: read

.github/workflows/javascript-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
# Runs the WordPress Core JavaScript tests.
4848
test-js:
4949
name: QUnit Tests
50-
uses: WordPress/wordpress-develop/.github/workflows/reusable-javascript-tests.yml@trunk
50+
uses: ./.github/workflows/reusable-javascript-tests.yml
5151
permissions:
5252
contents: read
5353
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
5454

5555
slack-notifications:
5656
name: Slack Notifications
57-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
57+
uses: ./.github/workflows/slack-notifications.yml
5858
permissions:
5959
actions: read
6060
contents: read

.github/workflows/local-docker-environment.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
#
6464
build-test-matrix:
6565
name: Build Test Matrix
66-
uses: WordPress/wordpress-develop/.github/workflows/reusable-support-json-reader-v1.yml@trunk
66+
uses: ./.github/workflows/reusable-support-json-reader-v1.yml
6767
permissions:
6868
contents: read
6969
secrets: inherit
@@ -74,7 +74,7 @@ jobs:
7474
# Tests the local Docker environment.
7575
environment-tests-mysql:
7676
name: PHP ${{ matrix.php }}
77-
uses: WordPress/wordpress-develop/.github/workflows/reusable-test-local-docker-environment-v1.yml@trunk
77+
uses: ./.github/workflows/reusable-test-local-docker-environment-v1.yml
7878
permissions:
7979
contents: read
8080
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
@@ -107,7 +107,7 @@ jobs:
107107

108108
slack-notifications:
109109
name: Slack Notifications
110-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
110+
uses: ./.github/workflows/slack-notifications.yml
111111
permissions:
112112
actions: read
113113
contents: read

.github/workflows/performance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
# Runs the performance test suite.
3434
performance:
3535
name: ${{ matrix.multisite && 'Multisite' || 'Single site' }}
36-
uses: WordPress/wordpress-develop/.github/workflows/reusable-performance.yml@trunk
36+
uses: ./.github/workflows/reusable-performance.yml
3737
permissions:
3838
contents: read
3939
if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) }}
@@ -50,7 +50,7 @@ jobs:
5050

5151
slack-notifications:
5252
name: Slack Notifications
53-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
53+
uses: ./.github/workflows/slack-notifications.yml
5454
permissions:
5555
actions: read
5656
contents: read

.github/workflows/php-compatibility.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ jobs:
4444
# Runs PHP compatibility testing.
4545
php-compatibility:
4646
name: Check PHP compatibility
47-
uses: WordPress/wordpress-develop/.github/workflows/reusable-php-compatibility.yml@trunk
47+
uses: ./.github/workflows/reusable-php-compatibility.yml
4848
permissions:
4949
contents: read
5050
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
5151

5252
slack-notifications:
5353
name: Slack Notifications
54-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
54+
uses: ./.github/workflows/slack-notifications.yml
5555
permissions:
5656
actions: read
5757
contents: read

.github/workflows/phpunit-tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
#
3737
test-with-mysql:
3838
name: PHP ${{ matrix.php }}
39-
uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
39+
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
4040
permissions:
4141
contents: read
4242
secrets: inherit
@@ -107,7 +107,7 @@ jobs:
107107
#
108108
test-with-mariadb:
109109
name: PHP ${{ matrix.php }}
110-
uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
110+
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
111111
permissions:
112112
contents: read
113113
secrets: inherit
@@ -157,7 +157,7 @@ jobs:
157157
#
158158
test-innovation-releases:
159159
name: PHP ${{ matrix.php }}
160-
uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
160+
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
161161
permissions:
162162
contents: read
163163
secrets: inherit
@@ -200,7 +200,7 @@ jobs:
200200
#
201201
specific-test-groups:
202202
name: ${{ matrix.phpunit-test-groups }}
203-
uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
203+
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
204204
permissions:
205205
contents: read
206206
secrets: inherit
@@ -220,7 +220,7 @@ jobs:
220220

221221
slack-notifications:
222222
name: Slack Notifications
223-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
223+
uses: ./.github/workflows/slack-notifications.yml
224224
permissions:
225225
actions: read
226226
contents: read

.github/workflows/test-and-zip-default-themes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ jobs:
203203

204204
slack-notifications:
205205
name: Slack Notifications
206-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
206+
uses: ./.github/workflows/slack-notifications.yml
207207
permissions:
208208
actions: read
209209
contents: read

.github/workflows/test-build-processes.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
# Tests the WordPress Core build process on multiple operating systems.
3232
test-core-build-process:
3333
name: Core running from ${{ matrix.directory }}
34-
uses: WordPress/wordpress-develop/.github/workflows/reusable-test-core-build-process.yml@trunk
34+
uses: ./.github/workflows/reusable-test-core-build-process.yml
3535
permissions:
3636
contents: read
3737
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
@@ -63,7 +63,7 @@ jobs:
6363
# See https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability.
6464
test-core-build-process-macos:
6565
name: Core running from ${{ matrix.directory }}
66-
uses: WordPress/wordpress-develop/.github/workflows/reusable-test-core-build-process.yml@trunk
66+
uses: ./.github/workflows/reusable-test-core-build-process.yml
6767
permissions:
6868
contents: read
6969
if: ${{ github.repository == 'WordPress/wordpress-develop' }}
@@ -79,7 +79,7 @@ jobs:
7979
# Tests the Gutenberg plugin build process on multiple operating systems when run within a wordpress-develop checkout.
8080
test-gutenberg-build-process:
8181
name: Gutenberg running from ${{ matrix.directory }}
82-
uses: WordPress/wordpress-develop/.github/workflows/reusable-test-gutenberg-build-process.yml@trunk
82+
uses: ./.github/workflows/reusable-test-gutenberg-build-process.yml
8383
permissions:
8484
contents: read
8585
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
@@ -102,7 +102,7 @@ jobs:
102102
# See https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability.
103103
test-gutenberg-build-process-macos:
104104
name: Gutenberg running from ${{ matrix.directory }}
105-
uses: WordPress/wordpress-develop/.github/workflows/reusable-test-gutenberg-build-process.yml@trunk
105+
uses: ./.github/workflows/reusable-test-gutenberg-build-process.yml
106106
permissions:
107107
contents: read
108108
if: ${{ github.repository == 'WordPress/wordpress-develop' }}
@@ -117,7 +117,7 @@ jobs:
117117

118118
slack-notifications:
119119
name: Slack Notifications
120-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
120+
uses: ./.github/workflows/slack-notifications.yml
121121
permissions:
122122
actions: read
123123
contents: read

0 commit comments

Comments
 (0)