Merge remote-tracking branch 'refs/remotes/origin/add/converge-wpcoms…

…h' into add/converge-wpcomsh
Automattic · Jun 11, 2024 · b79c93d · b79c93d
2 parents 87b268a + e1a95d7
commit b79c93d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/files/generate-ci-matrix.php b/.github/files/generate-ci-matrix.php
@@ -91,7 +91,7 @@
 
 // Add wpcomsh tests.
 $matrix[] = array(
-	'name'         => 'PHP tests: PHP 7.4 WP latest with WPCOMSH',
+	'name'         => 'PHP tests: PHP 8.1 WP latest with WPCOMSH',
 	'script'       => 'test-php',
 	'php'          => '8.1',
 	'wp'           => 'latest',

diff --git a/projects/plugins/wpcomsh/.gitattributes b/projects/plugins/wpcomsh/.gitattributes
@@ -18,6 +18,7 @@ package.json      export-ignore
 .eslintignore                                 production-exclude
 .dockerignore                                 production-exclude
 .editorconfig                                 production-exclude
+composer.lock                                 production-exclude
 /.circleci/**                                 production-exclude
 /.gitignore                                   production-exclude
 /.phpcsignore                                 production-exclude
@@ -30,17 +31,20 @@ package.json      export-ignore
 /node_modules/**                              production-exclude
 /phpunit.xml.dist                             production-exclude
 /README.md                                    production-exclude
-/vendor/automattic/**/README.md               production-exclude
 /vendor/automattic/**/src/css/*.scss          production-exclude
 /vendor/automattic/**/composer.json           production-exclude
 /vendor/automattic/jetpack-autoloader/**      production-exclude
 /vendor/automattic/jetpack-changelogger/**    production-exclude
 /vendor/automattic/jetpack-composer-plugin/** production-exclude
+/vendor/**/.git*                              production-exclude
+/vendor/**/.git*/**                           production-exclude
+/vendor/**/*.md                               production-exclude
+**/*.md                                       production-exclude
 /bin/**                                       production-exclude
 /build/**                                     production-exclude
 /tests/**                                     production-exclude
 /.circleci/**                                 production-exclude
-p.*ntrc                                       production-exclude
+.*ntrc                                        production-exclude
 Makefile                                      production-exclude
 *.mdown                                       production-exclude
 error_log                                     production-exclude
diff --git a/projects/plugins/wpcomsh/composer.json b/projects/plugins/wpcomsh/composer.json
@@ -9,7 +9,7 @@
 		"automattic/custom-fonts": "^3.0",
 		"automattic/custom-fonts-typekit": "^2.0",
 		"automattic/text-media-widget-styles": "^2.0",
-		"automattic/wc-calypso-bridge": "2.4.1",
+		"automattic/wc-calypso-bridge": "2.5.1",
 		"wordpress/classic-editor-plugin": "1.5",
 		"automattic/jetpack-config": "@dev",
 		"automattic/jetpack-post-list": "@dev",