Skip to content

Commit

Permalink
minor #31095 Skip testing the phpunit-bridge on not-master branches w…
Browse files Browse the repository at this point in the history
…hen $deps is empty (nicolas-grekas)

This PR was merged into the 3.4 branch.

Discussion
----------

Skip testing the phpunit-bridge on not-master branches when $deps is empty

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Tests are not in sync with the autoloaded code on these jobs.
The bridge is still tested on deps=low/high jobs + master

Commits
-------

b0ee192 Skip testing the phpunit-bridge on not-master branches when $deps is empty
  • Loading branch information
nicolas-grekas committed Apr 12, 2019
2 parents 3403a8e + b0ee192 commit 39f2084
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions .appveyor.yml
Expand Up @@ -63,6 +63,7 @@ test_script:
- SET X=0
- cd c:\php && copy /Y php.ini-min php.ini
- cd c:\projects\symfony
- IF %APPVEYOR_REPO_BRANCH% neq master (rm -Rf src\Symfony\Bridge\PhpUnit)
- php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
- cd c:\php && 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul && copy /Y php.ini-min php.ini
- cd c:\projects\symfony
Expand Down
7 changes: 7 additions & 0 deletions .travis.yml
Expand Up @@ -224,6 +224,12 @@ install:
SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
fi
- |
# Skip the phpunit-bridge on not-master branches when $deps is empty
if [[ ! $deps && $TRAVIS_BRANCH != master ]]; then
COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n')
fi
- |
# Install symfony/flex
if [[ $deps = low ]]; then
Expand Down Expand Up @@ -271,6 +277,7 @@ install:
echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable) && $PHPUNIT_X'"
echo "$COMPONENTS" | xargs -n1 -I{} tar --append -f ~/php-ext/composer-lowest.lock.tar {}/composer.lock
elif [[ $PHP = hhvm* ]]; then
rm src/Symfony/Bridge/PhpUnit -Rf
$PHPUNIT --exclude-group no-hhvm,benchmark,intl-data
else
echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
Expand Down

0 comments on commit 39f2084

Please sign in to comment.