Skip to content

Commit e659186

Browse files
sabernhardtsabernhardt
committed
Merge branch 'trunk' of https://github.com/sabernhardt/wordpress-develop into trunk
2 parents 1ce036f + 0d730aa commit e659186

860 files changed

Lines changed: 48931 additions & 12820 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: 7 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@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
49+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
5050
with:
5151
node-version-file: '.nvmrc'
5252
check-latest: true
@@ -62,6 +62,11 @@ jobs:
6262
- name: Install npm Dependencies
6363
run: npm ci
6464

65+
- name: Run Emoji precommit task
66+
run: npm run grunt precommit:emoji
67+
env:
68+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
69+
6570
- name: Build WordPress to run from ${{ inputs.directory }}
6671
run: npm run build${{ inputs.directory == 'src' && ':dev' || '' }}
6772

@@ -79,7 +84,7 @@ jobs:
7984
run: git diff --exit-code
8085

8186
- name: Upload ZIP as a GitHub Actions artifact
82-
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
87+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
8388
if: ${{ inputs.directory == 'build' && 'ubuntu-latest' == inputs.os }}
8489
with:
8590
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@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
7676

7777
- name: Set up PHP
78-
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2.28.0
78+
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2.30.0
7979
with:
8080
php-version: 'latest'
8181
coverage: none
@@ -88,7 +88,7 @@ jobs:
8888
run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
8989

9090
- name: Cache PHPCS scan cache
91-
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
91+
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
9292
with:
9393
path: |
9494
.cache/phpcs-src.json
@@ -98,7 +98,7 @@ jobs:
9898
# Since Composer dependencies are installed using `composer update` and no lock file is in version control,
9999
# passing a custom cache suffix ensures that the cache is flushed at least once per week.
100100
- name: Install Composer dependencies
101-
uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
101+
uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a # v3.0.0
102102
with:
103103
custom-cache-suffix: ${{ steps.get-date.outputs.date }}
104104

@@ -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@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
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: 7 additions & 8 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@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
79+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
8080
with:
8181
node-version-file: '.nvmrc'
8282
cache: npm
@@ -108,12 +108,11 @@ jobs:
108108
- name: Docker debug information
109109
run: |
110110
docker -v
111-
docker-compose -v
112-
docker-compose run --rm mysql mysql --version
113-
docker-compose run --rm php php --version
114-
docker-compose run --rm php php -m
115-
docker-compose run --rm php php -i
116-
docker-compose run --rm php locale -a
111+
docker compose run --rm mysql mysql --version
112+
docker compose run --rm php php --version
113+
docker compose run --rm php php -m
114+
docker compose run --rm php php -i
115+
docker compose run --rm php locale -a
117116
118117
- name: Install WordPress
119118
env:
@@ -127,7 +126,7 @@ jobs:
127126
run: npm run test:e2e
128127

129128
- name: Archive debug artifacts (screenshots, HTML snapshots)
130-
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
129+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
131130
if: always()
132131
with:
133132
name: failures-artifacts${{ matrix.LOCAL_SCRIPT_DEBUG && '-SCRIPT_DEBUG' || '' }}-${{ github.run_id }}

‎.github/workflows/install-testing.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
142142
steps:
143143
- name: Set up PHP ${{ matrix.php }}
144-
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2.28.0
144+
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2.30.0
145145
with:
146146
php-version: '${{ matrix.php }}'
147147
coverage: none

‎.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@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
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: 8 additions & 9 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@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
113+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
114114
with:
115115
node-version-file: '.nvmrc'
116116
cache: npm
@@ -142,12 +142,11 @@ jobs:
142142
- name: Docker debug information
143143
run: |
144144
docker -v
145-
docker-compose -v
146-
docker-compose run --rm mysql mysql --version
147-
docker-compose run --rm php php --version
148-
docker-compose run --rm php php -m
149-
docker-compose run --rm php php -i
150-
docker-compose run --rm php locale -a
145+
docker compose run --rm mysql mysql --version
146+
docker compose run --rm php php --version
147+
docker compose run --rm php php -m
148+
docker compose run --rm php php -i
149+
docker compose run --rm php locale -a
151150
152151
- name: Install WordPress
153152
run: npm run env:install
@@ -192,7 +191,7 @@ jobs:
192191
git reset --hard $TARGET_SHA
193192
194193
- name: Set up Node.js
195-
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
194+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
196195
with:
197196
node-version-file: '.nvmrc'
198197
cache: npm
@@ -220,7 +219,7 @@ jobs:
220219
run: git reset --hard $GITHUB_SHA
221220

222221
- name: Set up Node.js
223-
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
222+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
224223
with:
225224
node-version-file: '.nvmrc'
226225
cache: npm

‎.github/workflows/php-compatibility.yml‎

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

7272
- name: Set up PHP
73-
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35 # v2.28.0
73+
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2.30.0
7474
with:
7575
php-version: '7.4'
7676
coverage: none
@@ -87,15 +87,15 @@ jobs:
8787
run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
8888

8989
- name: Cache PHP compatibility scan cache
90-
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
90+
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
9191
with:
9292
path: .cache/phpcompat.json
9393
key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-phpcompat-cache-${{ hashFiles('**/composer.json', 'phpcompat.xml.dist') }}
9494

9595
# Since Composer dependencies are installed using `composer update` and no lock file is in version control,
9696
# passing a custom cache suffix ensures that the cache is flushed at least once per week.
9797
- name: Install Composer dependencies
98-
uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
98+
uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a # v3.0.0
9999
with:
100100
custom-cache-suffix: ${{ steps.get-date.outputs.date }}
101101

0 commit comments

Comments
 (0)