Skip to content

Commit

Permalink
Merge pull request #5691 from Automattic/staging
Browse files Browse the repository at this point in the history
Production release v20240702.0
  • Loading branch information
rebeccahum authored Jul 2, 2024
2 parents d852aaf + 7796357 commit 0f9b1e5
Show file tree
Hide file tree
Showing 22 changed files with 2,669 additions and 1,287 deletions.
2 changes: 1 addition & 1 deletion .github/actions/run-wp-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ runs:
fi
- name: Set up PHP
uses: shivammathur/setup-php@2.30.5
uses: shivammathur/setup-php@2.31.0
with:
coverage: ${{ steps.coverage.outputs.coverage }}
ini-values: ${{ steps.coverage.outputs.ini }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/changelog-summary-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
egress-policy: audit

- name: Check out source code
uses: actions/[email protected].6
uses: actions/[email protected].7

- name: Retrieve tags
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
Expand All @@ -50,7 +50,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- uses: softprops/[email protected].5
- uses: softprops/[email protected].6
with:
generate_release_notes: true
tag_name: ${{ steps.id-generator.outputs.id }}
Expand All @@ -61,7 +61,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/[email protected].6
uses: actions/[email protected].7

- name: Setup PHP
uses: shivammathur/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog-summary-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/[email protected].6
uses: actions/[email protected].7

- name: Setup PHP
uses: shivammathur/[email protected]
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ jobs:
- { wp: 6.2.x, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
- { wp: 6.3.x, ms: 'no', jp: 'yes', php: '8.1', phpunit: '' }
- { wp: 6.3.x, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
- { wp: 6.4.x, ms: 'no', jp: 'yes', php: '8.1', phpunit: '' }
- { wp: 6.4.x, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
- { wp: latest, ms: 'no', jp: 'yes', php: '8.1', phpunit: '', coverage: 'yes' }
- { wp: latest, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '', coverage: 'yes' }
- { wp: nightly, ms: 'no', jp: 'yes', php: '8.1', phpunit: '' }
Expand All @@ -62,7 +64,7 @@ jobs:
MYSQL_DATABASE: wordpress_test
steps:
- name: Check out source code
uses: actions/[email protected].6
uses: actions/[email protected].7
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- javascript
steps:
- name: Checkout repository
uses: actions/[email protected].6
uses: actions/[email protected].7

- name: Initialize CodeQL
uses: github/codeql-action/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/core-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ jobs:
echo "PHP_FPM_GID=$(id -g)" >> "${GITHUB_ENV}"
- name: Checkout WordPress
uses: actions/[email protected].6
uses: actions/[email protected].7
with:
repository: wordpress/wordpress-develop
path: wordpress
ref: ${{ steps.version.outputs.latest }}

- name: Check out source code
uses: actions/[email protected].6
uses: actions/[email protected].7
with:
submodules: recursive
path: wordpress/src/wp-content/mu-plugins
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
MYSQL_DATABASE: wordpress_test
steps:
- name: Check out source code
uses: actions/[email protected].6
uses: actions/[email protected].7
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
github.com:443
- name: Check out the source code
uses: actions/[email protected].6
uses: actions/[email protected].7

- name: Review dependencies
uses: actions/[email protected]
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ jobs:
contents: write
steps:
- name: Check out the source code
uses: actions/[email protected].6
uses: actions/[email protected].7
with:
submodules: recursive
path: ${{ env.SOURCE_REPO_PATH }}

- name: Check out Automattic/vip-go-mu-plugins-ext
uses: actions/[email protected].6
uses: actions/[email protected].7
with:
repository: Automattic/vip-go-mu-plugins-ext
path: ${{ env.EXT_REPO_PATH }}

- name: Check out Automattic/vip-go-mu-plugins-built
uses: actions/[email protected].6
uses: actions/[email protected].7
with:
repository: Automattic/vip-go-mu-plugins-built
path: ${{ env.TARGET_REPO_PATH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
wordpress.org:443

- name: Check out repository code
uses: actions/[email protected].6
uses: actions/[email protected].7
with:
submodules: true

Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
egress-policy: audit

- name: Check out repository code
uses: actions/[email protected].6
uses: actions/[email protected].7

- name: Setup Node
uses: actions/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out source code
uses: actions/[email protected].6
uses: actions/[email protected].7

- name: Set up PHP
uses: shivammathur/[email protected]
Expand All @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out source code
uses: actions/[email protected].6
uses: actions/[email protected].7

- name: Setup Node
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/parsely.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
MYSQL_DATABASE: wordpress_test
steps:
- name: Check out source code
uses: actions/[email protected].6
uses: actions/[email protected].7
with:
submodules: recursive

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/search-dev-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
contents: write
steps:
- name: Check out source code
uses: actions/[email protected].6
uses: actions/[email protected].7
with:
token: ${{ secrets.WPCOM_VIP_BOT_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/search-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

steps:
- name: Checkout
uses: actions/[email protected].6
uses: actions/[email protected].7
with:
submodules: recursive

Expand Down
12 changes: 6 additions & 6 deletions __tests__/e2e/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"erusev/parsedown": "1.7.4",
"dms/phpunit-arraysubset-asserts": "0.5.0",
"yoast/phpunit-polyfills": "2.0.1",
"johnpbloch/wordpress-core": "6.5.3",
"johnpbloch/wordpress-core": "6.5.5",
"wp-phpunit/wp-phpunit": "6.5.4",
"wp-cli/wp-cli": "2.10.0"
},
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion files/class-vip-filesystem.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public function filter_upload_dir( $params ) {
* @param string[] An array of data for a single file.
*/
public function filter_validate_file( $file ) {
$file_name = $file['name'];
$file_name = rawurlencode( $file['name'] );
$upload_path = trailingslashit( $this->get_upload_path() );
$file_path = $upload_path . $file_name;

Expand Down
Loading

0 comments on commit 0f9b1e5

Please sign in to comment.