8000 minor #31095 Skip testing the phpunit-bridge on not-master branches w… · symfony/symfony@39f2084 · GitHub
[go: up one dir, main page]
Skip to content

Commit 39f2084

Browse files
nicolas-grekasnicolas-grekas
committed
minor #31095 Skip testing the phpunit-bridge on not-master branches when $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
2 parents 3403a8e + b0ee192 commit 39f2084

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

‎.appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ test_script:
6363
- SET X=0
6464
- cd c:\php && copy /Y php.ini-min php.ini
6565
- cd c:\projects\symfony
66+
- IF %APPVEYOR_REPO_BRANCH% neq master (rm -Rf src\Symfony\Bridge\PhpUnit)
6667
- php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
6768
- cd c:\php && 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul && copy /Y php.ini-min php.ini
6869
- cd c:\projects\symfony

‎.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,12 @@ install:
224224
SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
225225
fi
226226
227+
- |
228+
# Skip the phpunit-bridge on not-master branches when $deps is empty
229+
if [[ ! $deps && $TRAVIS_BRANCH != master ]]; then
230+
COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n')
231+
fi
232+
227233
- |
228234
# Install symfony/flex
229235
if [[ $deps = low ]]; then
@@ -271,6 +277,7 @@ install:
271277
echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable) && $PHPUNIT_X'"
272278
echo "$COMPONENTS" | xargs -n1 -I{} tar --append -f ~/php-ext/composer-lowest.lock.tar {}/composer.lock
273279
elif [[ $PHP = hhvm* ]]; then
280+
rm src/Symfony/Bridge/PhpUnit -Rf
274281
$PHPUNIT --exclude-group no-hhvm,benchmark,intl-data
275282
else
276283
echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"

0 commit comments

Comments
 (0)
0