Merge branch 'trunk' into add/licensing-protect-redirect

Automattic · Sep 3, 2024 · 163d85c · 163d85c
2 parents 7c3db0a + 6e2517d
commit 163d85c
Show file tree

Hide file tree

Showing 756 changed files with 11,751 additions and 6,996 deletions.
diff --git a/.github/actions/tool-setup/action.yml b/.github/actions/tool-setup/action.yml
@@ -89,7 +89,7 @@ runs:
 
     - name: Setup pnpm
       if: steps.versions.outputs.node-version != 'false'
-      uses: pnpm/action-setup@v3.0.0
+      uses: pnpm/action-setup@v4.0.0
       with:
         version: ${{ steps.versions.outputs.pnpm-version }}
     - name: Setup Node

diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -66,7 +66,7 @@
 		// These aren't a monorepo, but we may as well do them all together anyway.
 		{
 			groupName: 'GitHub API packages',
-			matchPackagePatterns: [ '^@actions/', '^@octokit/' ],
+			matchPackageNames: [ '@actions/**', '@octokit/**' ],
 		},
 		{
 			groupName: 'GitHub actions upload/download artifact',
@@ -76,12 +76,12 @@
 		{
 			groupName: 'Codeception packages',
 			matchDatasources: [ 'packagist' ],
-			matchPackagePrefixes: [ 'codeception/' ],
+			matchPackageNames: [ 'codeception/**' ],
 		},
 		{
 			groupName: 'Docker actions',
 			matchDepTypes: [ 'action' ],
-			matchPackagePrefixes: [ 'docker/' ],
+			matchPackageNames: [ 'docker/**' ],
 		},
 
 		// 🤷

diff --git a/.github/workflows/block-performance.yml b/.github/workflows/block-performance.yml
@@ -3,6 +3,7 @@ name: Jetpack block performance
 on:
   schedule:
     - cron:  '0 */12 * * *'
+  workflow_dispatch:
 
 env:
   # Work around a bug in node 18.18.0. See https://github.com/webpack-contrib/thread-loader/issues/191 for details.
@@ -18,27 +19,27 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - uses: actions/checkout@v4
         with:
           repository: 'WordPress/gutenberg'
           path: 'gutenberg'
 
-      - name: Build Gutenberg
-        working-directory: gutenberg
-        run: |
-          npm ci
-          npx playwright install chromium --with-deps
-          npm run build:packages
-
       - uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('gutenberg/**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
 
+      - name: Build Gutenberg
+        working-directory: gutenberg
+        run: |
+          npm ci
+          npx playwright install chromium --with-deps
+          npm run build:packages
+
       - name: Setup tools for J
         uses: ./.github/actions/tool-setup
 
@@ -87,6 +88,7 @@ jobs:
         with:
           name: test-output-block-perf
           path: tools/e2e-commons/results
+          include-hidden-files: true
 
   test-reports:
     name: "Trigger test report workflow"

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -88,7 +88,7 @@ jobs:
             org.opencontainers.image.documentation=${{ github.server_url }}/${{ github.repository }}/blob/trunk/tools/docker/README.md
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: tools/docker
           platforms: linux/amd64,linux/arm64

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -304,6 +304,7 @@ jobs:
         with:
           name: test-output-${{ matrix.project }}
           path: ${{ matrix.path }}/output
+          include-hidden-files: true
 
   test-report:
     name: "Test report"

diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml
@@ -44,7 +44,7 @@ jobs:
           configurationFile: /tmp/monorepo/.github/renovate-config.js
           token: ${{ secrets.RENOVATE_TOKEN }}
           mount-docker-socket: true
-          renovate-version: 37.246.1
+          renovate-version: 38.57.3
         env:
           LOG_LEVEL: ${{ github.event.inputs.logLevel || 'debug' }}
           RENOVATE_DRY_RUN: ${{ github.event.inputs.dryRun == 'no' && 'null' || github.event.inputs.dryRun || 'null' }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -220,6 +220,7 @@ jobs:
         with:
           name: ${{ matrix.artifact }}
           path: artifacts
+          include-hidden-files: true
           retention-days: 7
 
   storybook-test:

diff --git a/.phan/stubs/wpcom-stubs.php b/.phan/stubs/wpcom-stubs.php
@@ -4,7 +4,7 @@
  * `bin/teamcity-builds/jetpack-stubs/stub-defs.php` and regenerate the stubs
  * by triggering the Jetpack Staging → Update WPCOM Stubs job in TeamCity.
  *
- * Stubs automatically generated from WordPress.com commit 120a8ddd2199a9845d257ab30d4185c38465a9d5.
+ * Stubs automatically generated from WordPress.com commit 02203431cbf90f588596be49598db6819cd93427.
  */
 
 namespace {
@@ -103,7 +103,7 @@ function __construct()
          * @param bool $check_feature
          * @return array|false|WP_Error
          */
-        public function republicize_post($post_id, $message, $skip_connections, $check_feature = \false)
+        public function republicize_post($post_id, $message, $skip_connections, $check_feature = \false, $sync = \true)
         {
         }
     }
@@ -1421,6 +1421,17 @@ function get_blog_subscriptions_aggregate_count(int $blog_id = null, $post_term_
     {
     }
 }
+namespace WPCOM\Jetpack_AI {
+    class Feature_Control
+    {
+        /**
+         * @return array
+         */
+        public static function get_features(): array
+        {
+        }
+    }
+}
 namespace WPCOM\Jetpack_AI\Usage {
     class Helper
     {

diff --git a/composer.lock b/composer.lock