Changeset 47125
- Timestamp:
- 01/29/2020 03:20:38 PM (5 years ago)
- Location:
- branches/5.3
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/5.3
- Property svn:mergeinfo changed
/trunk merged: 46999-47001
- Property svn:mergeinfo changed
-
branches/5.3/docker-compose.yml
r46320 r47125 106 106 PHP_FPM_UID: ${PHP_FPM_UID-1000} 107 107 PHP_FPM_GID: ${PHP_FPM_GID-1000} 108 TRAVIS_BRANCH: ${TRAVIS_BRANCH-false} 109 TRAVIS_PULL_REQUEST: ${TRAVIS_PULL_REQUEST-false} 108 110 109 111 volumes: -
branches/5.3/tests/phpunit/includes/abstract-testcase.php
r46451 r47125 187 187 */ 188 188 public function skipOnAutomatedBranches() { 189 // gentenv can be disabled190 if ( ! function_exists( 'getenv' ) ) {191 return false;192 }193 194 189 // https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables 195 190 $travis_branch = getenv( 'TRAVIS_BRANCH' ); 196 191 $travis_pull_request = getenv( 'TRAVIS_PULL_REQUEST' ); 197 192 198 if ( false !== $travis_pull_request && 'master' !== $travis_branch ) { 193 if ( ! $travis_branch || ! $travis_pull_request ) { 194 return; 195 } 196 197 if ( 'master' !== $travis_branch || 'false' !== $travis_pull_request ) { 199 198 $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' ); 200 199 }
Note: See TracChangeset
for help on using the changeset viewer.