Merge pull request #6019 from Automattic/staging

Production release: v20241126.0
Automattic · Nov 26, 2024 · 6729596 · 6729596
2 parents e95b988 + 0fec8dd
commit 6729596
Show file tree

Hide file tree

Showing 21 changed files with 321 additions and 135 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.2.1
+      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
@@ -80,7 +80,7 @@ runs:
       uses: ramsey/composer-install@3.0.0
 
     - name: Set up WordPress and WordPress Test Library
-      uses: sjinks/setup-wordpress-test-library@v2.1.1
+      uses: sjinks/setup-wordpress-test-library@v2.1.2
       with:
         version: ${{ inputs.wordpress }}
 
@@ -122,7 +122,7 @@ runs:
         "${PHPUNIT}" ${OPTIONS}
 
     - name: Upload coverage report
-      uses: codecov/codecov-action@v4.6.0
+      uses: codecov/codecov-action@v5.0.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
@@ -50,7 +50,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: softprops/action-gh-release@v2.0.9
+      - uses: softprops/action-gh-release@v2.1.0
         with:
           generate_release_notes: true
           tag_name: ${{ steps.id-generator.outputs.id }}

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -32,10 +32,10 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.27.0
+        uses: github/codeql-action/init@v3.27.4
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.27.0
+        uses: github/codeql-action/analyze@v3.27.4
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:
@@ -57,6 +60,7 @@ jobs:
       - 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
@@ -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/composer-install@3.0.0
+        with:
+          working-directory: wordpress
 
       - name: Install npm dependencies
         run: npm ci

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -25,4 +25,4 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Review dependencies
-        uses: actions/dependency-review-action@v4.3.4
+        uses: actions/dependency-review-action@v4.4.0
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

diff --git a/000-vip-init.php b/000-vip-init.php
@@ -244,6 +244,7 @@
 	__DIR__ . '/telemetry/tracks/class-tracks-event-dto.php',
 	__DIR__ . '/telemetry/tracks/class-tracks-event.php',
 	__DIR__ . '/telemetry/tracks/class-tracks-client.php',
+	__DIR__ . '/telemetry/tracks/tracks-utils.php',
 ];
 
 // If there is a missing file, the loop will break and the telemetry files will not be loaded at all

diff --git a/__tests__/e2e/bin/setup-env.sh b/__tests__/e2e/bin/setup-env.sh
@@ -22,14 +22,26 @@ if [ -z "${version}" ]; then
     version=${WORDPRESS_VERSION:-latest}
 fi
 
+if [ "${version}" = "latest" ]; then
+    WPVER="$(wget https://github.com/Automattic/vip-container-images/raw/refs/heads/master/wordpress/versions.json -O - | jq -r '[.[] | select(.prerelease == false)] | max_by(.tag) | .tag')"
+else
+    WPVER="$(wget https://github.com/Automattic/vip-container-images/raw/refs/heads/master/wordpress/versions.json -O - | jq -r --arg ref_value "${version}" '.[] | select(.ref == $ref_value) | .tag')"
+fi
+
+if [ -z "${WPVER}" ]; then
+    WPVER=trunk
+fi
+
 # Destroy existing test site
 vip dev-env destroy --slug=e2e-test-site || true
 
 # Create and run test site
-vip --slug=e2e-test-site dev-env create --title="E2E Testing site" --mu-plugins="${pluginPath}" --mailpit false --wordpress=trunk --multisite=false --app-code="${clientCodePath}" --php 8.2 --xdebug false --phpmyadmin false --elasticsearch true < /dev/null
+vip --slug=e2e-test-site dev-env create --title="E2E Testing site" --mu-plugins="${pluginPath}" --mailpit false --wordpress="${WPVER}" --multisite=false --app-code="${clientCodePath}" --php 8.2 --xdebug false --phpmyadmin false --elasticsearch true < /dev/null
 vip dev-env start --slug e2e-test-site --skip-wp-versions-check
-vip dev-env shell --root --slug e2e-test-site -- chown -R www-data:www-data /wp
+vip dev-env shell --root --slug e2e-test-site -- chown -R www-data:www-data /wp/wp-content/plugins
 vip dev-env exec --slug e2e-test-site --quiet -- wp plugin install --activate classic-editor
-vip dev-env exec --slug e2e-test-site --quiet -- wp core update --force --version="${version}"
-vip dev-env exec --slug e2e-test-site --quiet -- wp core update-db
+if [ "${WPVER}" = 'trunk' ]; then
+    vip dev-env exec --slug e2e-test-site --quiet -- wp core update --force --version="${version}"
+    vip dev-env exec --slug e2e-test-site --quiet -- wp core update-db
+fi
 vip dev-env exec --slug e2e-test-site --quiet -- wp rewrite structure '/%postname%/'
diff --git a/__tests__/e2e/package-lock.json b/__tests__/e2e/package-lock.json
diff --git a/__tests__/e2e/package.json b/__tests__/e2e/package.json
@@ -18,7 +18,7 @@
     "asana-phrase": "^0.0.8",
     "eslint": "^8.51.0",
     "eslint-plugin-deprecation": "^3.0.0",
-    "eslint-plugin-playwright": "^1.0.1",
+    "eslint-plugin-playwright": "^2.0.1",
     "typescript": "^5.2.2"
   }
 }
diff --git a/composer.json b/composer.json
@@ -6,8 +6,8 @@
         "erusev/parsedown": "1.7.4",
         "dms/phpunit-arraysubset-asserts": "0.5.0",
         "yoast/phpunit-polyfills": "3.0.0",
-        "johnpbloch/wordpress-core": "6.6.2",
-        "wp-phpunit/wp-phpunit": "6.6.2",
+        "johnpbloch/wordpress-core": "6.7.0",
+        "wp-phpunit/wp-phpunit": "6.7.0",
         "wp-cli/wp-cli": "2.11.0"
     },
     "config": {

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