Merge branch 'trunk' into add/my-protect-card-scan-threats

.github/files/check-lock-files.sh

@@ -30,7 +30,7 @@ for FILE in $(git -c core.quotepath=off ls-files 'pnpm-lock.yaml' '**/pnpm-lock.
 	echo "::endgroup::"
 	if ! git diff --exit-code pnpm-lock.yaml; then
 		echo "---" # Bracket message containing newlines for better visibility in GH's logs.
-		echo "::error file=$FILE::$FILE is not up to date!%0AYou can probably fix this by running \`pnpm install\` in the appropriate directory."
+		echo "::error file=$FILE::$FILE is not up to date!%0AYou can probably fix this by running \`pnpm install\`.%0AIf that doesn't do it, try \`pnpm install --resolution-only\`."
 		echo "---"
 		EXIT=1
 	fi

.github/files/jetpack-staging-sites/k6-shared.js

@@ -14,18 +14,16 @@ export const sites = [
 		note: 'normal site',
 		blog_id: '215379549',
 	},
-	/* Comment out pending rename. p1720019588866209-slack-C05Q5HSS013
 	{
-		url: 'https://jetpackedgephp74.wpcomstaging.com',
-		note: 'php 7.4',
+		url: 'https://jetpackedgephpold.wpcomstaging.com',
+		note: 'php old',
 		blog_id: '215379848',
 	},
 	{
-		url: 'https://jetpackedgephp82.wpcomstaging.com',
-		note: 'php 8.2',
+		url: 'https://jetpackedgephpnew.wpcomstaging.com',
+		note: 'php new',
 		blog_id: '215380000',
 	},
-	*/
 	{
 		url: 'https://jetpackedgeecomm.wpcomstaging.com',
 		note: 'ecommerce plan',

.github/files/jetpack-staging-sites/update-jetpack-staging-sites.sh

@@ -18,6 +18,18 @@ SITES='{
     "ssh_string": "[email protected]",
     "blog_id": "215379549"
   },
+  "jetpackedgephpold.wpcomstaging.com": {
+    "url": "https://jetpackedgephpold.wpcomstaging.com/",
+    "note": "php old",
+    "ssh_string": "[email protected]",
+    "blog_id": "215379848"
+  },
+  "jetpackedgephpnew.wpcomstaging.com": {
+    "url": "https://jetpackedgephpnew.wpcomstaging.com/",
+    "note": "php new",
+    "ssh_string": "[email protected]",
+    "blog_id": "215380000"
+  },
   "jetpackedgeecomm.wpcomstaging.com": {
     "url": "https://jetpackedgeecomm.wpcomstaging.com/",
     "note": "ecommerce plan",
@@ -43,19 +55,6 @@ SITES='{
     "blog_id": "215380213"
   }
 }'
-# Removed from the above pending a rename. p1720019588866209-slack-C05Q5HSS013
-#  "jetpackedgephp74.wpcomstaging.com": {
-#    "url": "https://jetpackedgephp74.wpcomstaging.com/",
-#    "note": "php 7.4",
-#    "ssh_string": "[email protected]",
-#    "blog_id": "215379848"
-#  },
-#  "jetpackedgephp82.wpcomstaging.com": {
-#    "url": "https://jetpackedgephp82.wpcomstaging.com/",
-#    "note": "php 8.2",
-#    "ssh_string": "[email protected]",
-#    "blog_id": "215380000"
-#  },
 
 ####################################################
 ## Fetch plugin data from the Jetpack Beta Builder.