Skip to content

Commit 7e137f6

Browse files
afragenafragen
committed
Auto stash before merge of "hello-dolly" and "afragen/hello-dolly"
1 parent bfb600c commit 7e137f6

142 files changed

Lines changed: 256 additions & 38110 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: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,7 @@ jobs:
115115
116116
steps:
117117
- name: Set up PHP ${{ matrix.php }}
118-
<<<<<<< Updated upstream
119-
<<<<<<< Updated upstream
120-
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
121-
=======
122118
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
123-
>>>>>>> Stashed changes
124-
=======
125-
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
126-
>>>>>>> Stashed changes
127119
with:
128120
php-version: '${{ matrix.php }}'
129121
coverage: none

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,7 @@ jobs:
5555
#
5656
test-with-mysql:
5757
name: PHP ${{ matrix.php }}
58-
<<<<<<< Updated upstream
59-
<<<<<<< Updated upstream
60-
uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
61-
=======
6258
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
63-
>>>>>>> Stashed changes
64-
=======
65-
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
66-
>>>>>>> Stashed changes
6759
permissions:
6860
contents: read
6961
secrets: inherit
@@ -134,15 +126,7 @@ jobs:
134126
#
135127
test-with-mariadb:
136128
name: PHP ${{ matrix.php }}
137-
<<<<<<< Updated upstream
138-
<<<<<<< Updated upstream
139-
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
143-
=======
144129
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
145-
>>>>>>> Stashed changes
146130
permissions:
147131
contents: read
148132
secrets: inherit

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,7 @@ jobs:
200200
const prBody = pr.body ?? '';
201201
const prTitle = pr.title ?? '';
202202
203-
<<<<<<< Updated upstream
204-
<<<<<<< Updated upstream
205-
const tracTicketRegex = new RegExp( '(https?://core.trac.wordpress.org/ticket/|Core-)([0-9]+)', 'g' );
206-
=======
207203
const tracTicketRegex = new RegExp( '(https?://core.trac.wordpress.org/ticket/|Core-|ticket:)([0-9]+)', 'g' );
208-
>>>>>>> Stashed changes
209-
=======
210-
const tracTicketRegex = new RegExp( '(https?://core.trac.wordpress.org/ticket/|Core-|ticket:)([0-9]+)', 'g' );
211-
>>>>>>> Stashed changes
212204
const tracTicketMatches = prBody.match( tracTicketRegex ) || prTitle.match( tracTicketRegex );
213205
214206
if ( ! tracTicketMatches ) {

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

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

4242
- name: Set up Node.js
43-
<<<<<<< Updated upstream
44-
<<<<<<< Updated upstream
45-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
46-
=======
4743
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
48-
>>>>>>> Stashed changes
49-
=======
50-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
51-
>>>>>>> Stashed changes
5244
with:
5345
node-version-file: '.nvmrc'
5446
cache: npm

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

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,10 @@ on:
1616
required: false
1717
type: 'boolean'
1818
default: false
19-
<<<<<<< Updated upstream
20-
<<<<<<< Updated upstream
21-
=======
22-
=======
23-
>>>>>>> Stashed changes
2419

2520
# Disable permissions for all available scopes by default.
2621
# Any needed permissions should be configured at the job level.
2722
permissions: {}
28-
<<<<<<< Updated upstream
29-
>>>>>>> Stashed changes
30-
=======
31-
>>>>>>> Stashed changes
3223

3324
jobs:
3425
# Runs the PHP coding standards checks.
@@ -61,15 +52,7 @@ jobs:
6152
persist-credentials: false
6253

6354
- name: Set up PHP
64-
<<<<<<< Updated upstream
65-
<<<<<<< Updated upstream
66-
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
67-
=======
6855
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
69-
>>>>>>> Stashed changes
70-
=======
71-
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
72-
>>>>>>> Stashed changes
7356
with:
7457
php-version: ${{ inputs.php-version }}
7558
coverage: none
@@ -82,15 +65,7 @@ jobs:
8265
run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> "$GITHUB_OUTPUT"
8366

8467
- name: Cache PHPCS scan cache
85-
<<<<<<< Updated upstream
86-
<<<<<<< Updated upstream
87-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
88-
=======
89-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
90-
>>>>>>> Stashed changes
91-
=======
9268
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
93-
>>>>>>> Stashed changes
9469
with:
9570
path: |
9671
.cache/phpcs-src.json

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

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

8484
- name: Set up Node.js
85-
<<<<<<< Updated upstream
86-
<<<<<<< Updated upstream
87-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
88-
=======
8985
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
90-
>>>>>>> Stashed changes
91-
=======
92-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
93-
>>>>>>> Stashed changes
9486
with:
9587
node-version-file: '.nvmrc'
9688
cache: npm
@@ -153,15 +145,7 @@ jobs:
153145
run: npm run test:e2e
154146

155147
- name: Archive debug artifacts (screenshots, HTML snapshots)
156-
<<<<<<< Updated upstream
157-
<<<<<<< Updated upstream
158-
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
159-
=======
160-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
161-
>>>>>>> Stashed changes
162-
=======
163148
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
164-
>>>>>>> Stashed changes
165149
if: always()
166150
with:
167151
name: failures-artifacts${{ inputs.LOCAL_SCRIPT_DEBUG && '-SCRIPT_DEBUG' || '' }}-${{ github.run_id }}

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

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

4343
- name: Set up Node.js
44-
<<<<<<< Updated upstream
45-
<<<<<<< Updated upstream
46-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
47-
=======
4844
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
49-
>>>>>>> Stashed changes
50-
=======
51-
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
52-
>>>>>>> Stashed changes
5345
with:
5446
node-version-file: '.nvmrc'
5547
cache: npm

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

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -131,36 +131,15 @@ jobs:
131131
with:
132132
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
133133
fetch-depth: ${{ github.event_name == 'workflow_dispatch' && '2' || '1' }}
134-
<<<<<<< Updated upstream
135-
<<<<<<< Updated upstream
136-
=======
137134
persist-credentials: false
138-
>>>>>>> Stashed changes
139-
=======
140-
persist-credentials: false
141-
>>>>>>> Stashed changes
142135

143136
# The `workflow_dispatch` event is the only one missing the needed SHA to target.
144137
- name: Retrieve previous commit SHA (if necessary)
145138
if: ${{ github.event_name == 'workflow_dispatch' }}
146-
<<<<<<< Updated upstream
147-
<<<<<<< Updated upstream
148-
run: echo "TARGET_SHA=$(git rev-parse HEAD^1)" >> $GITHUB_ENV
149-
150-
- name: Set up Node.js
151-
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
158-
=======
159139
run: echo "TARGET_SHA=$(git rev-parse HEAD^1)" >> "$GITHUB_ENV"
160140

161141
- name: Set up Node.js
162142
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
163-
>>>>>>> Stashed changes
164143
with:
165144
node-version-file: '.nvmrc'
166145
cache: npm
@@ -333,15 +312,7 @@ jobs:
333312
run: npm run test:performance
334313

335314
- name: Archive artifacts
336-
<<<<<<< Updated upstream
337-
<<<<<<< Updated upstream
338-
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
339-
=======
340-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
341-
>>>>>>> Stashed changes
342-
=======
343315
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
344-
>>>>>>> Stashed changes
345316
if: always()
346317
with:
347318
name: performance-artifacts${{ inputs.multisite && '-multisite' || '' }}${{ inputs.memcached && '-memcached' || '' }}-${{ github.run_id }}

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

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

4848
- name: Set up PHP
49-
<<<<<<< Updated upstream
50-
<<<<<<< Updated upstream
51-
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
52-
=======
5349
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
54-
>>>>>>> Stashed changes
55-
=======
56-
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
57-
>>>>>>> Stashed changes
5850
with:
5951
php-version: ${{ inputs.php-version }}
6052
coverage: none
@@ -71,15 +63,7 @@ jobs:
7163
run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> "$GITHUB_OUTPUT"
7264

7365
- name: Cache PHP compatibility scan cache
74-
<<<<<<< Updated upstream
75-
<<<<<<< Updated upstream
76-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
77-
=======
78-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
79-
>>>>>>> Stashed changes
80-
=======
8166
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
82-
>>>>>>> Stashed changes
8367
with:
8468
path: .cache/phpcompat.json
8569
key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-php-${{ inputs.php-version }}-phpcompat-cache-${{ hashFiles('**/composer.json', 'phpcompat.xml.dist') }}

0 commit comments

Comments
 (0)