diff --git a/Gruntfile.js b/Gruntfile.js index 87159bec07..f30545cacb 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1639,15 +1639,9 @@ module.exports = function(grunt) { var done = this.async(); var flags = this.flags; var args = changedFiles.php; - if ( flags.travisErrors ) { - // We can check the entire codebase for coding standards errors. - args = [ 'lint:errors' ]; - } else if ( flags.travisWarnings ) { - // We can check the tests directory for errors and warnings. - args = [ 'lint', 'tests' ]; - } else { - args.unshift( 'lint' ); - } + + args.unshift( 'lint' ); + grunt.util.spawn( { cmd: 'composer', args: args, @@ -1661,11 +1655,6 @@ module.exports = function(grunt) { } ); } ); - // Travis CI tasks. - grunt.registerTask('travis:js', 'Runs JavaScript Travis CI tasks.', [ 'jshint:corejs', 'qunit:compiled' ]); - grunt.registerTask('travis:phpunit', 'Runs PHPUnit Travis CI tasks.', [ 'build', 'phpunit' ]); - grunt.registerTask('travis:phpcs', 'Runs PHP Coding Standards Travis CI tasks.', [ 'format:php:error', 'lint:php:travisErrors:error', 'lint:php:travisWarnings:error' ]); - // Patch task. grunt.renameTask('patch_wordpress', 'patch'); diff --git a/README.md b/README.md index 952d037d37..5f6fc5951b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # WordPress -[![Build Status](https://img.shields.io/travis/com/WordPress/wordpress-develop/master.svg)](https://travis-ci.com/WordPress/wordpress-develop) - Welcome to the WordPress development repository! Please check out the [contributor handbook](https://make.wordpress.org/core/handbook/) for information about how to open bug reports, contribute patches, test changes, write documentation, or get involved in any way you can. * [Getting Started](#getting-started) diff --git a/docker-compose.yml b/docker-compose.yml index 9f598714d8..12f7772607 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -108,8 +108,6 @@ services: WP_MULTISITE: ${WP_MULTISITE-false} PHP_FPM_UID: ${PHP_FPM_UID-1000} PHP_FPM_GID: ${PHP_FPM_GID-1000} - TRAVIS_BRANCH: ${TRAVIS_BRANCH-false} - TRAVIS_PULL_REQUEST: ${TRAVIS_PULL_REQUEST-false} GITHUB_REF: ${GITHUB_REF-false} GITHUB_EVENT_NAME: ${GITHUB_EVENT_NAME-false} diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 0aeda7b762..0f15b16849 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -96,7 +96,7 @@ - + ^build/* diff --git a/tests/phpunit/includes/abstract-testcase.php b/tests/phpunit/includes/abstract-testcase.php index 1c532b9372..886725addd 100644 --- a/tests/phpunit/includes/abstract-testcase.php +++ b/tests/phpunit/includes/abstract-testcase.php @@ -181,14 +181,10 @@ abstract class WP_UnitTestCase_Base extends PHPUnit\Framework\TestCase { /** * Allow tests to be skipped on some automated runs. * - * For test runs on Travis/GitHub Actions for something other than trunk/master, + * For test runs on GitHub Actions for something other than trunk/master, * we want to skip tests that only need to run for master. */ public function skipOnAutomatedBranches() { - // https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables - $travis_branch = getenv( 'TRAVIS_BRANCH' ); - $travis_pull_request = getenv( 'TRAVIS_PULL_REQUEST' ); - // https://docs.github.com/en/free-pro-team@latest/actions/reference/environment-variables#default-environment-variables $github_event_name = getenv( 'GITHUB_EVENT_NAME' ); $github_ref = getenv( 'GITHUB_REF' ); @@ -200,11 +196,6 @@ abstract class WP_UnitTestCase_Base extends PHPUnit\Framework\TestCase { if ( in_array( $github_event_name, $skipped, true ) || 'refs/heads/master' !== $github_ref ) { $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' ); } - } elseif ( $travis_branch && 'false' !== $travis_branch ) { - // We're on Travis CI. - if ( 'master' !== $travis_branch || 'false' !== $travis_pull_request ) { - $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' ); - } } }