Skip to content

Commit cdeedc0

Browse files
authored
Merge pull request #5627 from Automattic/staging
Production release v20240604.0
2 parents 43076be + 58ebd63 commit cdeedc0

22 files changed

+1270
-1324
lines changed

.github/actions/prepare-source/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runs:
44
using: composite
55
steps:
66
- name: Check out mu-plugins-ext
7-
uses: actions/[email protected].5
7+
uses: actions/[email protected].6
88
with:
99
repository: 'Automattic/vip-go-mu-plugins-ext'
1010
path: 'vip-go-mu-plugins-ext'

.github/workflows/changelog-summary-prod.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
egress-policy: audit
2626

2727
- name: Check out source code
28-
uses: actions/[email protected].5
28+
uses: actions/[email protected].6
2929

3030
- name: Retrieve tags
3131
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
@@ -61,7 +61,7 @@ jobs:
6161
runs-on: ubuntu-latest
6262
steps:
6363
- name: Checkout repository
64-
uses: actions/[email protected].5
64+
uses: actions/[email protected].6
6565

6666
- name: Setup PHP
6767
uses: shivammathur/[email protected]

.github/workflows/changelog-summary-staging.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/[email protected].5
19+
uses: actions/[email protected].6
2020

2121
- name: Setup PHP
2222
uses: shivammathur/[email protected]

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
MYSQL_DATABASE: wordpress_test
6363
steps:
6464
- name: Check out source code
65-
uses: actions/[email protected].5
65+
uses: actions/[email protected].6
6666
with:
6767
submodules: recursive
6868

.github/workflows/codeql-analysis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ jobs:
2929
- javascript
3030
steps:
3131
- name: Checkout repository
32-
uses: actions/[email protected].5
32+
uses: actions/[email protected].6
3333

3434
- name: Initialize CodeQL
35-
uses: github/codeql-action/[email protected].5
35+
uses: github/codeql-action/[email protected].6
3636
with:
3737
languages: ${{ matrix.language }}
3838
config-file: ./.github/codeql-config.yml
3939

4040
- name: Perform CodeQL Analysis
41-
uses: github/codeql-action/[email protected].5
41+
uses: github/codeql-action/[email protected].6

.github/workflows/core-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ jobs:
4242
echo "PHP_FPM_GID=$(id -g)" >> "${GITHUB_ENV}"
4343
4444
- name: Checkout WordPress
45-
uses: actions/[email protected].5
45+
uses: actions/[email protected].6
4646
with:
4747
repository: wordpress/wordpress-develop
4848
path: wordpress
4949
ref: ${{ steps.version.outputs.latest }}
5050

5151
- name: Check out source code
52-
uses: actions/[email protected].5
52+
uses: actions/[email protected].6
5353
with:
5454
submodules: recursive
5555
path: wordpress/src/wp-content/mu-plugins

.github/workflows/coverage-develop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
MYSQL_DATABASE: wordpress_test
3737
steps:
3838
- name: Check out source code
39-
uses: actions/[email protected].5
39+
uses: actions/[email protected].6
4040
with:
4141
submodules: recursive
4242

.github/workflows/dependency-review.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
github.com:443
2323
2424
- name: Check out the source code
25-
uses: actions/[email protected].5
25+
uses: actions/[email protected].6
2626

2727
- name: Review dependencies
2828
uses: actions/[email protected]

.github/workflows/deploy.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ jobs:
2222
contents: write
2323
steps:
2424
- name: Check out the source code
25-
uses: actions/[email protected].5
25+
uses: actions/[email protected].6
2626
with:
2727
submodules: recursive
2828
path: ${{ env.SOURCE_REPO_PATH }}
2929

3030
- name: Check out Automattic/vip-go-mu-plugins-ext
31-
uses: actions/[email protected].5
31+
uses: actions/[email protected].6
3232
with:
3333
repository: Automattic/vip-go-mu-plugins-ext
3434
path: ${{ env.EXT_REPO_PATH }}
3535

3636
- name: Check out Automattic/vip-go-mu-plugins-built
37-
uses: actions/[email protected].5
37+
uses: actions/[email protected].6
3838
with:
3939
repository: Automattic/vip-go-mu-plugins-built
4040
path: ${{ env.TARGET_REPO_PATH }}

.github/workflows/e2e.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
wordpress.org:443
6969

7070
- name: Check out repository code
71-
uses: actions/[email protected].5
71+
uses: actions/[email protected].6
7272
with:
7373
submodules: true
7474

@@ -131,7 +131,7 @@ jobs:
131131
egress-policy: audit
132132

133133
- name: Check out repository code
134-
uses: actions/[email protected].5
134+
uses: actions/[email protected].6
135135

136136
- name: Setup Node
137137
uses: actions/[email protected]

.github/workflows/lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Check out source code
28-
uses: actions/[email protected].5
28+
uses: actions/[email protected].6
2929

3030
- name: Set up PHP
3131
uses: shivammathur/[email protected]
@@ -51,7 +51,7 @@ jobs:
5151
runs-on: ubuntu-latest
5252
steps:
5353
- name: Check out source code
54-
uses: actions/[email protected].5
54+
uses: actions/[email protected].6
5555

5656
- name: Setup Node
5757
uses: actions/[email protected]

.github/workflows/parsely.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
MYSQL_DATABASE: wordpress_test
5151
steps:
5252
- name: Check out source code
53-
uses: actions/[email protected].5
53+
uses: actions/[email protected].6
5454
with:
5555
submodules: recursive
5656

.github/workflows/search-dev-tools.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
contents: write
2323
steps:
2424
- name: Check out source code
25-
uses: actions/[email protected].5
25+
uses: actions/[email protected].6
2626
with:
2727
token: ${{ secrets.WPCOM_VIP_BOT_TOKEN }}
2828

.github/workflows/search-e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Checkout
33-
uses: actions/[email protected].5
33+
uses: actions/[email protected].6
3434
with:
3535
submodules: recursive
3636

000-vip-init.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
// Warning: Site Details depends on the existence of class Search.
251251
// If this changes in the future, please ensure that details for search are correctly extracted
252252
if ( ( defined( 'USE_VIP_ELASTICSEARCH' ) && USE_VIP_ELASTICSEARCH ) || // legacy constant name
253-
defined( 'VIP_ENABLE_VIP_SEARCH' ) && true === VIP_ENABLE_VIP_SEARCH ) {
253+
( defined( 'VIP_ENABLE_VIP_SEARCH' ) && true === VIP_ENABLE_VIP_SEARCH ) ) {
254254
require_once __DIR__ . '/search/search.php';
255255
}
256256

0 commit comments

Comments
 (0)