Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/add/converge-wpcoms…
Browse files Browse the repository at this point in the history
…h' into add/converge-wpcomsh
  • Loading branch information
zinigor committed Jun 11, 2024
2 parents 87b268a + e1a95d7 commit b79c93d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/files/generate-ci-matrix.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
8 changes: 6 additions & 2 deletions projects/plugins/wpcomsh/.gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion projects/plugins/wpcomsh/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit b79c93d

Please sign in to comment.