Skip to content

Commit 8bd2df1

Browse files
authored
Merge branch 'WordPress:trunk' into trunk
2 parents 3768078 + f19b20e commit 8bd2df1

126 files changed

Lines changed: 7820 additions & 4464 deletions

File tree

Some content is hidden

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

.github/workflows/install-testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# - Creates a `wp-config.php` file.
4040
# - Installs WordPress.
4141
install-tests-mysql:
42-
name: WP ${{ inputs.new-version || 'latest' }} / PHP ${{ matrix.php }} / ${{ 'mariadb' == matrix.db-type && 'MariaDB' || 'MySQL' }} ${{ matrix.db-version }}${{ matrix.multisite && ' multisite' || '' }}
42+
name: WP ${{ inputs.wp-version || 'latest' }} / PHP ${{ matrix.php }} / ${{ 'mariadb' == matrix.db-type && 'MariaDB' || 'MySQL' }} ${{ matrix.db-version }}${{ matrix.multisite && ' multisite' || '' }}
4343
permissions:
4444
contents: read
4545
runs-on: ubuntu-latest

.github/workflows/slack-notifications.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ jobs:
7171
run_id: ${{ github.run_id }},
7272
});
7373
74+
if ( '${{ inputs.calling_status }}' == 'failure' && workflow_run.data.run_attempt == 1 ) {
75+
return 'first-failure';
76+
}
77+
7478
// When a workflow has been restarted to fix a failure, check the previous run attempt.
7579
if ( workflow_run.data.run_attempt > 1 ) {
7680
const previous_run = await github.rest.actions.getWorkflowRunAttempt({
@@ -157,7 +161,7 @@ jobs:
157161
runs-on: ubuntu-latest
158162
timeout-minutes: 5
159163
needs: [ prepare ]
160-
if: ${{ inputs.calling_status == 'failure' || failure() }}
164+
if: ${{ needs.prepare.outputs.previous_conclusion != 'first-failure' && inputs.calling_status == 'failure' || failure() }}
161165

162166
steps:
163167
- name: Post failure notifications to Slack

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

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,52 @@ concurrency:
4949
permissions: {}
5050

5151
jobs:
52+
# Checks for zero-byte files.
53+
#
54+
# Occasionally, binary files such as images and fonts are added to themes incorrectly.
55+
# This checks that all files contain contents.
56+
#
57+
# Performs the following steps:
58+
# - Checks out the repository.
59+
# - Checks for zero-byte (empty) files.
60+
check-for-empty-files:
61+
name: ${{ matrix.theme }} empty file check
62+
runs-on: ubuntu-latest
63+
permissions:
64+
contents: read
65+
timeout-minutes: 10
66+
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
67+
strategy:
68+
fail-fast: false
69+
matrix:
70+
theme: [
71+
'twentytwentyfour',
72+
'twentytwentythree',
73+
'twentytwentytwo',
74+
'twentytwentyone',
75+
'twentytwenty',
76+
'twentynineteen',
77+
'twentyseventeen',
78+
'twentysixteen',
79+
'twentyfifteen',
80+
'twentyfourteen',
81+
'twentythirteen',
82+
'twentytwelve',
83+
'twentyeleven',
84+
'twentyten'
85+
]
86+
87+
steps:
88+
- name: Checkout repository
89+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
90+
with:
91+
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.branch || github.ref }}
92+
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
93+
94+
- name: Check for zero-byte (empty) files
95+
run: |
96+
[[ ! $(find src/wp-content/themes/${{ matrix.theme }} -empty) ]]
97+
5298
# Tests the build script for themes that have one.
5399
#
54100
# Performs the following steps:
@@ -110,13 +156,14 @@ jobs:
110156
runs-on: ubuntu-latest
111157
permissions:
112158
contents: read
113-
needs: [ test-build-scripts ]
159+
needs: [ check-for-empty-files, test-build-scripts ]
114160
timeout-minutes: 10
115161
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
116162
strategy:
117163
fail-fast: false
118164
matrix:
119165
theme: [
166+
'twentytwentyfour',
120167
'twentytwentythree',
121168
'twentytwentytwo',
122169
'twentytwentyone',
@@ -152,7 +199,7 @@ jobs:
152199
permissions:
153200
actions: read
154201
contents: read
155-
needs: [ bundle-theme, test-build-scripts ]
202+
needs: [ check-for-empty-files, bundle-theme, test-build-scripts ]
156203
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
157204
with:
158205
calling_status: ${{ contains( needs.*.result, 'cancelled' ) && 'cancelled' || contains( needs.*.result, 'failure' ) && 'failure' || 'success' }}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"require-dev": {
1919
"squizlabs/php_codesniffer": "3.7.2",
20-
"wp-coding-standards/wpcs": "~3.0.0",
20+
"wp-coding-standards/wpcs": "~3.0.1",
2121
"phpcompatibility/phpcompatibility-wp": "~2.1.3",
2222
"yoast/phpunit-polyfills": "^1.1.0"
2323
},

0 commit comments

Comments
 (0)