From 1635ae8e7d463807f00ee04011c41f42154ae902 Mon Sep 17 00:00:00 2001 From: Igor Zinovyev Date: Tue, 11 Jun 2024 21:37:39 +0300 Subject: [PATCH 1/3] Update projects/plugins/wpcomsh/composer.json Co-authored-by: Brad Jorsch --- projects/plugins/wpcomsh/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/plugins/wpcomsh/composer.json b/projects/plugins/wpcomsh/composer.json index 5b2ab9108c29a..38c7387e1d7df 100644 --- 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", From e640cd960fb0269594213af5dca33d9b6b9e6c02 Mon Sep 17 00:00:00 2001 From: Igor Zinovyev Date: Tue, 11 Jun 2024 21:37:49 +0300 Subject: [PATCH 2/3] Update .github/files/generate-ci-matrix.php Co-authored-by: Brad Jorsch --- .github/files/generate-ci-matrix.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/files/generate-ci-matrix.php b/.github/files/generate-ci-matrix.php index 4b32313e810cb..e14403d654c73 100755 --- 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', From e1a95d71893f7b8455a6845aa97bacde08725562 Mon Sep 17 00:00:00 2001 From: Igor Zinovyev Date: Tue, 11 Jun 2024 21:37:56 +0300 Subject: [PATCH 3/3] Update projects/plugins/wpcomsh/.gitattributes Co-authored-by: Brad Jorsch --- projects/plugins/wpcomsh/.gitattributes | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/plugins/wpcomsh/.gitattributes b/projects/plugins/wpcomsh/.gitattributes index baa62e4cd7130..6e990962a533f 100644 --- 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