Skip to content

Commit 6ea811d

Browse files
committed
Merge branch 'trunk' into html-api/reconstruct-active-formatting-elements-on-text
2 parents 9803b3c + d1e7c85 commit 6ea811d

446 files changed

Lines changed: 21557 additions & 6792 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.

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"username": "wordpress"
1212
},
1313
"ghcr.io/devcontainers/features/node:1": {
14-
"version": "16"
14+
"version": "20"
1515
},
1616
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
1717
"ghcr.io/devcontainers/features/git:1": {}

.env

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ LOCAL_DB_TYPE=mysql
4646
##
4747
# The database version to use.
4848
#
49-
# Defaults to 5.7 with the assumption that LOCAL_DB_TYPE is set to `mysql` above.
49+
# Defaults to 8.0 with the assumption that LOCAL_DB_TYPE is set to `mysql` above.
5050
#
51-
# When using `mysql`, see https://hub.docker.com/r/amd64/mysql for valid versions.
52-
# When using `mariadb`, see https://hub.docker.com/r/amd64/mariadb for valid versions.
51+
# When using `mysql`, see https://hub.docker.com/_/mysql for valid versions.
52+
# When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
5353
##
54-
LOCAL_DB_VERSION=5.7
54+
LOCAL_DB_VERSION=8.0
5555

5656
# The debug settings to add to `wp-config.php`.
5757
LOCAL_WP_DEBUG=true

.github/workflows/callable-test-core-build-process.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
4747

4848
- name: Set up Node.js
49-
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
49+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
5050
with:
5151
node-version-file: '.nvmrc'
5252
check-latest: true
@@ -79,7 +79,7 @@ jobs:
7979
run: git diff --exit-code
8080

8181
- name: Upload ZIP as a GitHub Actions artifact
82-
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
82+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
8383
if: ${{ inputs.directory == 'build' && 'ubuntu-latest' == inputs.os }}
8484
with:
8585
name: wordpress-build-${{ github.event_name == 'pull_request' && github.event.number || github.sha }}

.github/workflows/callable-test-gutenberg-build-process.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
5656

5757
- name: Set up Node.js
58-
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
58+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
5959
with:
6060
node-version-file: '.nvmrc'
6161
check-latest: true

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
153153

154154
- name: Set up Node.js
155-
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
155+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
156156
with:
157157
node-version-file: '.nvmrc'
158158
cache: npm

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
7777

7878
- name: Set up Node.js
79-
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
79+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
8080
with:
8181
node-version-file: '.nvmrc'
8282
cache: npm
@@ -127,7 +127,7 @@ jobs:
127127
run: npm run test:e2e
128128

129129
- name: Archive debug artifacts (screenshots, HTML snapshots)
130-
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
130+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
131131
if: always()
132132
with:
133133
name: failures-artifacts${{ matrix.LOCAL_SCRIPT_DEBUG && '-SCRIPT_DEBUG' || '' }}-${{ github.run_id }}

.github/workflows/javascript-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
6868

6969
- name: Set up Node.js
70-
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
70+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
7171
with:
7272
node-version-file: '.nvmrc'
7373
cache: npm

.github/workflows/performance.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
111111

112112
- name: Set up Node.js
113-
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
113+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
114114
with:
115115
node-version-file: '.nvmrc'
116116
cache: npm
@@ -192,7 +192,7 @@ jobs:
192192
git reset --hard $TARGET_SHA
193193
194194
- name: Set up Node.js
195-
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
195+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
196196
with:
197197
node-version-file: '.nvmrc'
198198
cache: npm
@@ -220,7 +220,7 @@ jobs:
220220
run: git reset --hard $GITHUB_SHA
221221

222222
- name: Set up Node.js
223-
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
223+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
224224
with:
225225
node-version-file: '.nvmrc'
226226
cache: npm

.github/workflows/phpunit-tests-run.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
9191

9292
- name: Set up Node.js
93-
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
93+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
9494
with:
9595
node-version-file: '.nvmrc'
9696
cache: npm

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
132132

133133
- name: Set up Node.js
134-
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
134+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
135135
with:
136136
node-version-file: '.nvmrc'
137137
cache: npm
@@ -187,7 +187,7 @@ jobs:
187187
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
188188

189189
- name: Upload theme ZIP as an artifact
190-
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
190+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
191191
with:
192192
if-no-files-found: error
193193
name: ${{ matrix.theme }}

0 commit comments

Comments
 (0)