Merge branch 'develop' into add/users-last-seen

Automattic · Jan 31, 2025 · f18a889 · f18a889
2 parents 0bad466 + 40053c7
commit f18a889
Show file tree

Hide file tree

Showing 218 changed files with 12,673 additions and 18,282 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -99,7 +99,6 @@ wpcom-helper.php
 /shared-plugins/two-factor/dev-lib/
 /shared-plugins/two-factor/tests/
 **/tests/
-/vaultpress/changelog.txt
 /vip-support/.circleci
 /vip-support/bin/
 /vip-support/features/

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.7
+      uses: actions/checkout@v4.2.2
       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
@@ -60,8 +60,12 @@ runs:
           echo "ini=apc.enable_cli=1, opcache.enable_cli=1" >> $GITHUB_OUTPUT
         fi
 
+    - name: Install svn
+      run: sudo apt-get update && sudo apt-get install -y subversion
+      shell: bash
+
     - name: Set up PHP
-      uses: shivammathur/setup-php@2.31.0
+      uses: shivammathur/setup-php@2.32.0
       with:
         coverage: ${{ steps.coverage.outputs.coverage }}
         ini-values: ${{ steps.coverage.outputs.ini }}
@@ -80,7 +84,7 @@ runs:
       uses: ramsey/[email protected]
 
     - name: Set up WordPress and WordPress Test Library
-      uses: sjinks/setup-wordpress-test-library@2.0.2
+      uses: sjinks/setup-wordpress-test-library@v2.1.3
       with:
         version: ${{ inputs.wordpress }}
 
@@ -122,7 +126,7 @@ runs:
         "${PHPUNIT}" ${OPTIONS}
 
     - name: Upload coverage report
-      uses: codecov/codecov-action@v4.5.0
+      uses: codecov/codecov-action@v5.1.2
       with:
         files: ${{ inputs.coverage-file }}
         flags: ${{ inputs.coverage-flags }}

diff --git a/.github/workflows/changelog-summary-prod.yml b/.github/workflows/changelog-summary-prod.yml
@@ -25,7 +25,7 @@ jobs:
           egress-policy: audit
 
       - name: Check out source code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
 
       - name: Retrieve tags
         run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
@@ -50,7 +50,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: softprops/action-gh-release@v2.0.6
+      - uses: softprops/action-gh-release@v2.2.0
         with:
           generate_release_notes: true
           tag_name: ${{ steps.id-generator.outputs.id }}
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
 
       - name: Setup PHP
         uses: shivammathur/[email protected]

diff --git a/.github/workflows/changelog-summary-staging.yml b/.github/workflows/changelog-summary-staging.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
 
       - name: Setup PHP
         uses: shivammathur/[email protected]

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,16 +28,16 @@ jobs:
       matrix:
         config:
         # PHP 8.1, Jetpack
-          - { wp: 6.0.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
-          - { wp: 6.0.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
-          - { wp: 6.1.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
-          - { wp: 6.1.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
           - { wp: 6.2.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
           - { 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: 6.5.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.5.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.6.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.6.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: '' }
@@ -64,7 +64,7 @@ jobs:
           MYSQL_DATABASE: wordpress_test
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
         with:
           submodules: recursive
 

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -29,13 +29,13 @@ jobs:
           - javascript
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.25.10
+        uses: github/codeql-action/init@v3.28.1
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.25.10
+        uses: github/codeql-action/analyze@v3.28.1
diff --git a/.github/workflows/core-tests.yml b/.github/workflows/core-tests.yml
@@ -20,10 +20,13 @@ permissions:
   contents: read
 
 env:
-  LOCAL_PHP: "8.0-fpm"
+  LOCAL_PHP: "8.2-fpm"
+  LOCAL_PHP_XDEBUG: "false"
+  LOCAL_PHP_XDEBUG_MODE: "develop,debug"
   LOCAL_DB_TYPE: "mysql"
-  LOCAL_DB_VERSION: "8.0"
+  LOCAL_DB_VERSION: "8.3"
   LOCAL_PHP_MEMCACHED: "true"
+  LOCAL_WP_TESTS_DOMAIN: "example.org"
   PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: "true"
 
 jobs:
@@ -42,25 +45,26 @@ jobs:
           echo "PHP_FPM_GID=$(id -g)" >> "${GITHUB_ENV}"
 
       - name: Checkout WordPress
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
         with:
           repository: wordpress/wordpress-develop
           path: wordpress
           ref: ${{ steps.version.outputs.latest }}
 
       - name: Check out source code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
         with:
           submodules: recursive
           path: wordpress/src/wp-content/mu-plugins
 
       - name: Tweaks
         run: |
           echo "define( 'VIP_JETPACK_SKIP_LOAD', 'true' );" >> "wordpress/src/wp-content/mu-plugins/000-vip-init.php"
+          cp wordpress/.env.example wordpress/.env
           echo "GITHUB_EVENT_NAME=pull_request" >> "wordpress/.env"
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.1.0
         with:
           node-version-file: 'wordpress/.nvmrc'
           cache: npm
@@ -72,17 +76,10 @@ jobs:
           php-version: 8.0
           coverage: none
 
-      # - name: Install Composer dependencies
-      #   uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
-      #   with:
-      #     working-directory: wordpress
       - name: Install Composer dependencies
-        run: composer install -n
-        working-directory: wordpress
-
-      # - name: Downgrade PHPUnit
-      #   run: composer require --dev -n phpunit/phpunit:^9
-      #   working-directory: wordpress
+        uses: ramsey/[email protected]
+        with:
+          working-directory: wordpress
 
       - name: Install npm dependencies
         run: npm ci

diff --git a/.github/workflows/coverage-develop.yml b/.github/workflows/coverage-develop.yml
@@ -36,7 +36,7 @@ jobs:
           MYSQL_DATABASE: wordpress_test
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
         with:
           submodules: recursive
 

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -22,7 +22,7 @@ jobs:
             github.com:443
 
       - name: Check out the source code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
 
       - name: Review dependencies
-        uses: actions/dependency-review-action@v4.3.3
+        uses: actions/dependency-review-action@v4.5.0
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -22,19 +22,19 @@ jobs:
       contents: write
     steps:
       - name: Check out the source code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
         with:
           submodules: recursive
           path: ${{ env.SOURCE_REPO_PATH }}
 
       - name: Check out Automattic/vip-go-mu-plugins-ext
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
         with:
           repository: Automattic/vip-go-mu-plugins-ext
           path: ${{ env.EXT_REPO_PATH }}
 
       - name: Check out Automattic/vip-go-mu-plugins-built
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
         with:
           repository: Automattic/vip-go-mu-plugins-built
           path: ${{ env.TARGET_REPO_PATH }}

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -60,6 +60,7 @@ jobs:
             playwright.azureedge.net:443
             production.cloudflare.docker.com:443
             public-api.wordpress.com:443
+            raw.githubusercontent.com:443
             registry-1.docker.io:443
             registry.npmjs.org:443
             s.w.org:443
@@ -68,15 +69,15 @@ jobs:
             wordpress.org:443
 
       - name: Check out repository code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
         with:
           submodules: true
 
       - name: Prepare source code
         uses: ./.github/actions/prepare-source
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.1.0
         with:
           node-version: 'lts/*'
           cache: npm
@@ -131,10 +132,10 @@ jobs:
           egress-policy: audit
 
       - name: Check out repository code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.1.0
         with:
           node-version: 'lts/*'
           cache: npm

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
 
       - name: Set up PHP
         uses: shivammathur/[email protected]
@@ -35,7 +35,7 @@ jobs:
           fail-fast: 'true'
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.1.0
         with:
           node-version: 'lts/*'
           cache: npm
@@ -51,10 +51,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.1.0
         with:
           node-version: 'lts/*'
           cache: npm

diff --git a/.github/workflows/parsely.yml b/.github/workflows/parsely.yml
@@ -23,20 +23,12 @@ jobs:
       matrix:
         config:
           # Oldest version of the parsely plugin
-          - { wp: latest, parsely: '3.5', mode: 'filter_enabled', php: '8.1' }
-          - { wp: latest, parsely: '3.5', mode: 'filter_disabled', php: '8.1' }
-          - { wp: latest, parsely: '3.5', mode: 'option_enabled', php: '8.1' }
-          - { wp: latest, parsely: '3.5', mode: 'option_disabled', php: '8.1' }
-          - { wp: latest, parsely: '3.5', mode: 'filter_and_option_enabled', php: '8.1' }
-          - { wp: latest, parsely: '3.5', mode: 'filter_and_option_disabled', php: '8.1' }
+          - { wp: latest, parsely: '3.15', mode: 'filter_enabled', php: '8.1' }
+          - { wp: latest, parsely: '3.15', mode: 'filter_disabled', php: '8.1' }
 
           # Latest version of the parsely plugin
           - { wp: latest, mode: 'filter_enabled', php: '8.1' }
           - { wp: latest, mode: 'filter_disabled', php: '8.1' }
-          - { wp: latest, mode: 'option_enabled', php: '8.1' }
-          - { wp: latest, mode: 'option_disabled', php: '8.1' }
-          - { wp: latest, mode: 'filter_and_option_enabled', php: '8.1' }
-          - { wp: latest, mode: 'filter_and_option_disabled', php: '8.1' }
     services:
       mysql:
         image: mysql:8
@@ -50,7 +42,7 @@ jobs:
           MYSQL_DATABASE: wordpress_test
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
         with:
           submodules: recursive
 

diff --git a/.github/workflows/search-dev-tools.yml b/.github/workflows/search-dev-tools.yml
@@ -22,12 +22,12 @@ jobs:
       contents: write
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
         with:
           token: ${{ secrets.WPCOM_VIP_BOT_TOKEN }}
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.1.0
         with:
           node-version: 'lts/*'
           cache: npm

diff --git a/.github/workflows/search-e2e.yml b/.github/workflows/search-e2e.yml
@@ -1,6 +1,6 @@
 name: Enterprise Search e2e tests
 env:
-  NODE_VERSION: "16"
+  NODE_VERSION: "20"
 
 on:
   pull_request:
@@ -30,15 +30,15 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.1.7
+      uses: actions/checkout@v4.2.2
       with:
         submodules: recursive
 
     - name: Prepare source code
       uses: ./.github/actions/prepare-source
 
     - name: "Install node v${{ env.NODE_VERSION }}"
-      uses: actions/setup-node@v4.0.2
+      uses: actions/setup-node@v4.1.0
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: npm
@@ -69,7 +69,11 @@ jobs:
           ${{ github.workspace }}/tests/cypress/videos/
           ${{ github.workspace }}/tests/cypress/logs/
           ${{ github.workspace }}/cypress/results/
+          ${{ github.workspace }}/tests/search/e2e/screenshots/
+          ${{ github.workspace }}/tests/search/e2e/videos/
+          ${{ github.workspace }}/tests/search/e2e/logs/
 
     - name: Stop Elasticsearch
       if: always()
-      run: cd bin/search/es-docker/ && docker-compose down
+      run: docker compose down
+      working-directory: bin/search/es-docker