Merge pull request #5999 from Automattic/staging

undefined
Automattic · Nov 19, 2024 · 07a620b · 07a620b
2 parents 4655f8a + 49f957f
commit 07a620b
Show file tree

Hide file tree

Showing 45 changed files with 1,174 additions and 1,185 deletions.
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/[email protected].1
+        uses: actions/[email protected].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/[email protected].8
+      - uses: softprops/[email protected].9
         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/[email protected].1
+        uses: actions/[email protected].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/[email protected].1
+        uses: actions/[email protected].2
 
       - name: Setup PHP
         uses: shivammathur/[email protected]

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,8 +28,6 @@ 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: '' }
@@ -40,6 +38,8 @@ jobs:
           - { 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: '' }
@@ -66,7 +66,7 @@ jobs:
           MYSQL_DATABASE: wordpress_test
     steps:
       - name: Check out source code
-        uses: actions/[email protected].1
+        uses: actions/[email protected].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/[email protected].1
+        uses: actions/[email protected].2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.26.12
+        uses: github/codeql-action/init@v3.27.0
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.26.12
+        uses: github/codeql-action/analyze@v3.27.0
diff --git a/.github/workflows/core-tests.yml b/.github/workflows/core-tests.yml
@@ -42,14 +42,14 @@ jobs:
           echo "PHP_FPM_GID=$(id -g)" >> "${GITHUB_ENV}"
 
       - name: Checkout WordPress
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           repository: wordpress/wordpress-develop
           path: wordpress
           ref: ${{ steps.version.outputs.latest }}
 
       - name: Check out source code
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           submodules: recursive
           path: wordpress/src/wp-content/mu-plugins

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/[email protected].1
+        uses: actions/[email protected].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/[email protected].1
+        uses: actions/[email protected].2
 
       - name: Review dependencies
         uses: actions/[email protected]
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/[email protected].1
+        uses: actions/[email protected].2
         with:
           submodules: recursive
           path: ${{ env.SOURCE_REPO_PATH }}
 
       - name: Check out Automattic/vip-go-mu-plugins-ext
-        uses: actions/[email protected].1
+        uses: actions/[email protected].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/[email protected].1
+        uses: actions/[email protected].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
@@ -68,7 +68,7 @@ jobs:
             wordpress.org:443
 
       - name: Check out repository code
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           submodules: true
 
@@ -131,7 +131,7 @@ jobs:
           egress-policy: audit
 
       - name: Check out repository code
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
 
       - name: Setup Node
         uses: actions/[email protected]

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/[email protected].1
+        uses: actions/[email protected].2
 
       - name: Set up PHP
         uses: shivammathur/[email protected]
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out source code
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
 
       - name: Setup Node
         uses: actions/[email protected]

diff --git a/.github/workflows/parsely.yml b/.github/workflows/parsely.yml
@@ -42,7 +42,7 @@ jobs:
           MYSQL_DATABASE: wordpress_test
     steps:
       - name: Check out source code
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           submodules: recursive
 

diff --git a/.github/workflows/search-dev-tools.yml b/.github/workflows/search-dev-tools.yml
@@ -22,7 +22,7 @@ jobs:
       contents: write
     steps:
       - name: Check out source code
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           token: ${{ secrets.WPCOM_VIP_BOT_TOKEN }}
 

diff --git a/.github/workflows/search-e2e.yml b/.github/workflows/search-e2e.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].1
+      uses: actions/[email protected].2
       with:
         submodules: recursive
 

diff --git a/__tests__/e2e/package-lock.json b/__tests__/e2e/package-lock.json
diff --git a/files/class-api-client.php b/files/class-api-client.php
@@ -207,6 +207,13 @@ public function get_file( $file_path ) {
 			'filename' => $tmp_file,
 		];
 
+		// Prevent webp => jpg transform from running
+		if ( str_ends_with( strtok( $file_path, '?' ), '.webp' ) ) {
+			$request_args['headers'] = [
+				'Accept' => 'image/webp',
+			];
+		}
+
 		// not in cache so get from API
 		$response = $this->call_api( $file_path, 'GET', $request_args );
 

diff --git a/integrations/enterprise-search.php b/integrations/enterprise-search.php
@@ -27,29 +27,6 @@ public function is_loaded(): bool {
 		return class_exists( \Automattic\VIP\Search\Search::class );
 	}
 
-	/**
-	 * Activates this integration with given options array.
-	 *
-	 * @param array $options An associative options array for the integration.
-	 *                       This can contain common parameters and integration specific parameters in `config` key.
-	 *
-	 * @private
-	 */
-	public function activate( array $options = [] ): void {
-		// If integration is already available in customer code then don't activate it from platform side.
-		if ( $this->is_loaded() ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
-			// Do nothing.
-		}
-
-		// Don't do anything if integration is already activated.
-		if ( $this->is_active() ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
-			// Do nothing.
-		}
-
-		$this->is_active = true;
-		$this->options   = $options;
-	}
-
 	/**
 	 * Loads the plugin.
 	 */
@@ -84,7 +61,7 @@ public function configure(): void {
 	 * Set the Elasticsearch credentials.
 	 */
 	public function vip_set_es_credentials(): void {
-		$config = $this->get_config();
+		$config = $this->get_env_config();
 		if ( isset( $config['username'] ) && isset( $config['password'] ) ) {
 			define( 'VIP_ELASTICSEARCH_USERNAME', $config['username'] );
 			define( 'VIP_ELASTICSEARCH_PASSWORD', $config['password'] );