Skip to content

Commit 1a8d5d9

Browse files
afragenafragen
committed
Auto stash before merge of "hello-dolly" and "afragen/hello-dolly"
1 parent 162a773 commit 1a8d5d9

142 files changed

Lines changed: 3984 additions & 0 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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,12 @@ jobs:
115115
116116
steps:
117117
- name: Set up PHP ${{ matrix.php }}
118+
<<<<<<< Updated upstream
118119
<<<<<<< Updated upstream
119120
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
121+
=======
122+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
123+
>>>>>>> Stashed changes
120124
=======
121125
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
122126
>>>>>>> Stashed changes

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,12 @@ jobs:
5555
#
5656
test-with-mysql:
5757
name: PHP ${{ matrix.php }}
58+
<<<<<<< Updated upstream
5859
<<<<<<< Updated upstream
5960
uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
61+
=======
62+
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
63+
>>>>>>> Stashed changes
6064
=======
6165
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
6266
>>>>>>> Stashed changes
@@ -130,8 +134,12 @@ jobs:
130134
#
131135
test-with-mariadb:
132136
name: PHP ${{ matrix.php }}
137+
<<<<<<< Updated upstream
133138
<<<<<<< Updated upstream
134139
uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
140+
=======
141+
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
142+
>>>>>>> Stashed changes
135143
=======
136144
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
137145
>>>>>>> Stashed changes

‎.github/workflows/pull-request-comments.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,12 @@ jobs:
200200
const prBody = pr.body ?? '';
201201
const prTitle = pr.title ?? '';
202202
203+
<<<<<<< Updated upstream
203204
<<<<<<< Updated upstream
204205
const tracTicketRegex = new RegExp( '(https?://core.trac.wordpress.org/ticket/|Core-)([0-9]+)', 'g' );
206+
=======
207+
const tracTicketRegex = new RegExp( '(https?://core.trac.wordpress.org/ticket/|Core-|ticket:)([0-9]+)', 'g' );
208+
>>>>>>> Stashed changes
205209
=======
206210
const tracTicketRegex = new RegExp( '(https?://core.trac.wordpress.org/ticket/|Core-|ticket:)([0-9]+)', 'g' );
207211
>>>>>>> Stashed changes

‎.github/workflows/reusable-coding-standards-javascript.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,12 @@ jobs:
4040
persist-credentials: false
4141

4242
- name: Set up Node.js
43+
<<<<<<< Updated upstream
4344
<<<<<<< Updated upstream
4445
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
46+
=======
47+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
48+
>>>>>>> Stashed changes
4549
=======
4650
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
4751
>>>>>>> Stashed changes

‎.github/workflows/reusable-coding-standards-php.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,17 @@ on:
1717
type: 'boolean'
1818
default: false
1919
<<<<<<< Updated upstream
20+
<<<<<<< Updated upstream
21+
=======
2022
=======
23+
>>>>>>> Stashed changes
2124

2225
# Disable permissions for all available scopes by default.
2326
# Any needed permissions should be configured at the job level.
2427
permissions: {}
28+
<<<<<<< Updated upstream
29+
>>>>>>> Stashed changes
30+
=======
2531
>>>>>>> Stashed changes
2632

2733
jobs:
@@ -55,8 +61,12 @@ jobs:
5561
persist-credentials: false
5662

5763
- name: Set up PHP
64+
<<<<<<< Updated upstream
5865
<<<<<<< Updated upstream
5966
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
67+
=======
68+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
69+
>>>>>>> Stashed changes
6070
=======
6171
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
6272
>>>>>>> Stashed changes
@@ -72,8 +82,12 @@ jobs:
7282
run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> "$GITHUB_OUTPUT"
7383

7484
- name: Cache PHPCS scan cache
85+
<<<<<<< Updated upstream
7586
<<<<<<< Updated upstream
7687
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
88+
=======
89+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
90+
>>>>>>> Stashed changes
7791
=======
7892
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
7993
>>>>>>> Stashed changes

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,12 @@ jobs:
8282
persist-credentials: false
8383

8484
- name: Set up Node.js
85+
<<<<<<< Updated upstream
8586
<<<<<<< Updated upstream
8687
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
88+
=======
89+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
90+
>>>>>>> Stashed changes
8791
=======
8892
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
8993
>>>>>>> Stashed changes
@@ -149,8 +153,12 @@ jobs:
149153
run: npm run test:e2e
150154

151155
- name: Archive debug artifacts (screenshots, HTML snapshots)
156+
<<<<<<< Updated upstream
152157
<<<<<<< Updated upstream
153158
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
159+
=======
160+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
161+
>>>>>>> Stashed changes
154162
=======
155163
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
156164
>>>>>>> Stashed changes

‎.github/workflows/reusable-javascript-tests.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@ jobs:
4141
persist-credentials: false
4242

4343
- name: Set up Node.js
44+
<<<<<<< Updated upstream
4445
<<<<<<< Updated upstream
4546
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
47+
=======
48+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
49+
>>>>>>> Stashed changes
4650
=======
4751
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
4852
>>>>>>> Stashed changes

‎.github/workflows/reusable-performance.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,18 +132,29 @@ jobs:
132132
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
133133
fetch-depth: ${{ github.event_name == 'workflow_dispatch' && '2' || '1' }}
134134
<<<<<<< Updated upstream
135+
<<<<<<< Updated upstream
136+
=======
137+
persist-credentials: false
138+
>>>>>>> Stashed changes
135139
=======
136140
persist-credentials: false
137141
>>>>>>> Stashed changes
138142

139143
# The `workflow_dispatch` event is the only one missing the needed SHA to target.
140144
- name: Retrieve previous commit SHA (if necessary)
141145
if: ${{ github.event_name == 'workflow_dispatch' }}
146+
<<<<<<< Updated upstream
142147
<<<<<<< Updated upstream
143148
run: echo "TARGET_SHA=$(git rev-parse HEAD^1)" >> $GITHUB_ENV
144149

145150
- name: Set up Node.js
146151
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
152+
=======
153+
run: echo "TARGET_SHA=$(git rev-parse HEAD^1)" >> "$GITHUB_ENV"
154+
155+
- name: Set up Node.js
156+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
157+
>>>>>>> Stashed changes
147158
=======
148159
run: echo "TARGET_SHA=$(git rev-parse HEAD^1)" >> "$GITHUB_ENV"
149160

@@ -322,8 +333,12 @@ jobs:
322333
run: npm run test:performance
323334

324335
- name: Archive artifacts
336+
<<<<<<< Updated upstream
325337
<<<<<<< Updated upstream
326338
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
339+
=======
340+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
341+
>>>>>>> Stashed changes
327342
=======
328343
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
329344
>>>>>>> Stashed changes

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,12 @@ jobs:
4646
persist-credentials: false
4747

4848
- name: Set up PHP
49+
<<<<<<< Updated upstream
4950
<<<<<<< Updated upstream
5051
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
52+
=======
53+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
54+
>>>>>>> Stashed changes
5155
=======
5256
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
5357
>>>>>>> Stashed changes
@@ -67,8 +71,12 @@ jobs:
6771
run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> "$GITHUB_OUTPUT"
6872

6973
- name: Cache PHP compatibility scan cache
74+
<<<<<<< Updated upstream
7075
<<<<<<< Updated upstream
7176
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
77+
=======
78+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
79+
>>>>>>> Stashed changes
7280
=======
7381
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
7482
>>>>>>> Stashed changes

‎.github/workflows/reusable-phpunit-tests-v1.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ on:
1414
description: 'Operating system to run tests on'
1515
required: false
1616
type: 'string'
17+
<<<<<<< Updated upstream
1718
<<<<<<< Updated upstream
1819
default: 'ubuntu-latest'
20+
=======
21+
default: 'ubuntu-24.04'
22+
>>>>>>> Stashed changes
1923
=======
2024
default: 'ubuntu-24.04'
2125
>>>>>>> Stashed changes
@@ -55,6 +59,10 @@ on:
5559
default: false
5660
env:
5761
<<<<<<< Updated upstream
62+
<<<<<<< Updated upstream
63+
=======
64+
COMPOSER_INSTALL: ${{ false }}
65+
>>>>>>> Stashed changes
5866
=======
5967
COMPOSER_INSTALL: ${{ false }}
6068
>>>>>>> Stashed changes
@@ -67,11 +75,17 @@ env:
6775
SLOW_TESTS: 'external-http,media'
6876

6977
<<<<<<< Updated upstream
78+
<<<<<<< Updated upstream
79+
=======
7080
=======
81+
>>>>>>> Stashed changes
7182
# Disable permissions for all available scopes by default.
7283
# Any needed permissions should be configured at the job level.
7384
permissions: {}
7485

86+
<<<<<<< Updated upstream
87+
>>>>>>> Stashed changes
88+
=======
7589
>>>>>>> Stashed changes
7690
jobs:
7791
# Runs the PHPUnit tests for WordPress.
@@ -101,6 +115,7 @@ jobs:
101115
steps:
102116
- name: Configure environment variables
103117
run: |
118+
<<<<<<< Updated upstream
104119
<<<<<<< Updated upstream
105120
echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
106121
echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
@@ -113,6 +128,8 @@ jobs:
113128
- name: Set up Node.js
114129
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
115130
=======
131+
=======
132+
>>>>>>> Stashed changes
116133
echo "PHP_FPM_UID=$(id -u)" >> "$GITHUB_ENV"
117134
echo "PHP_FPM_GID=$(id -g)" >> "$GITHUB_ENV"
118135

@@ -124,6 +141,9 @@ jobs:
124141

125142
- name: Set up Node.js
126143
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
144+
<<<<<<< Updated upstream
145+
>>>>>>> Stashed changes
146+
=======
127147
>>>>>>> Stashed changes
128148
with:
129149
node-version-file: '.nvmrc'
@@ -135,11 +155,14 @@ jobs:
135155
- name: Build WordPress
136156
run: npm run build
137157

158+
<<<<<<< Updated upstream
138159
<<<<<<< Updated upstream
139160
- name: Cache Composer dependencies
140161
if: ${{ env.COMPOSER_INSTALL == true }}
141162
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
142163
=======
164+
=======
165+
>>>>>>> Stashed changes
143166
- name: Get composer cache directory
144167
if: ${{ env.COMPOSER_INSTALL == true }}
145168
id: composer-cache
@@ -148,6 +171,9 @@ jobs:
148171
- name: Cache Composer dependencies
149172
if: ${{ env.COMPOSER_INSTALL == true }}
150173
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
174+
<<<<<<< Updated upstream
175+
>>>>>>> Stashed changes
176+
=======
151177
>>>>>>> Stashed changes
152178
env:
153179
cache-name: cache-composer-dependencies
@@ -175,8 +201,13 @@ jobs:
175201
if: ${{ inputs.memcached }}
176202
run: |
177203
cp tests/phpunit/includes/object-cache.php build/wp-content/object-cache.php
204+
<<<<<<< Updated upstream
178205
<<<<<<< Updated upstream
179206
docker run --name memcached --net $(basename "$PWD")_wpdevnet -d memcached
207+
=======
208+
BASE=$(basename "$PWD")
209+
docker run --name memcached --net "${BASE}_wpdevnet" -d memcached
210+
>>>>>>> Stashed changes
180211
=======
181212
BASE=$(basename "$PWD")
182213
docker run --name memcached --net "${BASE}_wpdevnet" -d memcached
@@ -188,9 +219,12 @@ jobs:
188219
node --version
189220
curl --version
190221
git --version
222+
<<<<<<< Updated upstream
191223
<<<<<<< Updated upstream
192224
svn --version
193225
=======
226+
>>>>>>> Stashed changes
227+
=======
194228
>>>>>>> Stashed changes
195229

196230
- name: Log running Docker containers
@@ -209,6 +243,7 @@ jobs:
209243

210244
- name: Run slow PHPUnit tests
211245
if: ${{ inputs.split_slow }}
246+
<<<<<<< Updated upstream
212247
<<<<<<< Updated upstream
213248
run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ${{ env.SLOW_TESTS }}
214249

@@ -232,6 +267,8 @@ jobs:
232267
if: ${{ ! inputs.multisite && ! inputs.split_slow }}
233268
run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group external-http
234269
=======
270+
=======
271+
>>>>>>> Stashed changes
235272
run: npm run "test:${PHPUNIT_SCRIPT}" -- --verbose -c "${PHPUNIT_CONFIG}" --group "${SLOW_TESTS}"
236273

237274
- name: Run PHPUnit tests for single site excluding slow tests
@@ -253,4 +290,7 @@ jobs:
253290
- name: Run external HTTP tests
254291
if: ${{ ! inputs.multisite && ! inputs.split_slow }}
255292
run: npm run "test:${PHPUNIT_SCRIPT}" -- --verbose -c phpunit.xml.dist --group external-http
293+
<<<<<<< Updated upstream
294+
>>>>>>> Stashed changes
295+
=======
256296
>>>>>>> Stashed changes

0 commit comments

Comments
 (0)