Merge pull request #5660 from Automattic/develop

Staging release v20240618.1
Automattic · Jun 18, 2024 · 5747599 · 5747599
2 parents b7acb69 + c2344f0
commit 5747599
Show file tree

Hide file tree

Showing 15 changed files with 574 additions and 564 deletions.
diff --git a/.github/actions/prepare-source/action.yml b/.github/actions/prepare-source/action.yml
@@ -4,7 +4,7 @@ runs:
   using: composite
   steps:
     - name: Check out mu-plugins-ext
-      uses: actions/checkout@v4.1.6
+      uses: actions/checkout@v4.1.7
       with:
         repository: 'Automattic/vip-go-mu-plugins-ext'
         path: 'vip-go-mu-plugins-ext'

diff --git a/.github/actions/run-wp-tests/action.yml b/.github/actions/run-wp-tests/action.yml
@@ -122,7 +122,7 @@ runs:
         "${PHPUNIT}" ${OPTIONS}
 
     - name: Upload coverage report
-      uses: codecov/codecov-action@v4.4.1
+      uses: codecov/codecov-action@v4.5.0
       with:
         files: ${{ inputs.coverage-file }}
         flags: ${{ inputs.coverage-flags }}

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -32,10 +32,10 @@ jobs:
         uses: actions/checkout@v4.1.6
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.25.7
+        uses: github/codeql-action/init@v3.25.10
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.25.7
+        uses: github/codeql-action/analyze@v3.25.10
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -25,4 +25,4 @@ jobs:
         uses: actions/checkout@v4.1.6
 
       - name: Review dependencies
-        uses: actions/dependency-review-action@v4.3.2
+        uses: actions/dependency-review-action@v4.3.3
diff --git a/__tests__/e2e/package-lock.json b/__tests__/e2e/package-lock.json
diff --git a/bin/test.sh b/bin/test.sh
@@ -115,6 +115,7 @@ docker run \
     ${interactive} \
     --rm \
     --network "${NETWORK_NAME}" \
+    --platform linux/x86_64 \
     -e WP_VERSION \
     -e WP_MULTISITE \
     -e PHP_VERSION \

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
         "dms/phpunit-arraysubset-asserts": "0.5.0",
         "yoast/phpunit-polyfills": "2.0.1",
         "johnpbloch/wordpress-core": "6.5.3",
-        "wp-phpunit/wp-phpunit": "6.5.3",
+        "wp-phpunit/wp-phpunit": "6.5.4",
         "wp-cli/wp-cli": "2.10.0"
     },
     "config": {

diff --git a/composer.lock b/composer.lock
diff --git a/cron-control/package-lock.json b/cron-control/package-lock.json
diff --git a/cron/cron-control/package-lock.json b/cron/cron-control/package-lock.json
diff --git a/jetpack b/jetpack
diff --git a/jetpack.php b/jetpack.php
@@ -4,7 +4,7 @@
  * Plugin URI: https://jetpack.com
  * Description: Security, performance, and marketing tools made by WordPress experts. Jetpack keeps your site protected so you can focus on more important things.
  * Author: Automattic
- * Version: 13.4.3
+ * Version: 13.5
  * Author URI: https://jetpack.com
  * License: GPL2+
  * Text Domain: jetpack
@@ -39,7 +39,7 @@ function vip_default_jetpack_version() {
 		return '13.1';
 	} else {
 		// WordPress 6.4 and newer.
-		return '13.4';
+		return '13.5';
 	}
 }
 

diff --git a/package-lock.json b/package-lock.json