Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 7788612

Browse filesBrowse files
Merge branch '4.3' into 4.4
* 4.3: [travis] fix CI
2 parents be5cd69 + be6a196 commit 7788612
Copy full SHA for 7788612

File tree

1 file changed

+6
-9
lines changed
Filter options

1 file changed

+6
-9
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+6-9Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -224,15 +224,15 @@ install:
224224
SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//) &&
225225
git fetch --depth=2 origin $SYMFONY_VERSION &&
226226
git checkout -m FETCH_HEAD &&
227-
COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
227+
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
228228
else
229229
SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
230230
fi
231231
232232
- |
233233
# Skip the phpunit-bridge on not-master branches when $deps is empty
234234
if [[ ! $deps && $TRAVIS_BRANCH != master ]]; then
235-
COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
235+
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
236236
fi
237237
238238
- |
@@ -246,7 +246,7 @@ install:
246246
247247
- |
248248
# Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one
249-
[[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]] && LEGACY=,legacy
249+
[[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]] && export LEGACY=,legacy
250250
251251
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
252252
if [[ $deps ]]; then mv composer.json.phpunit composer.json; fi
@@ -259,7 +259,7 @@ install:
259259
export PHP=$1
260260
if [[ $PHP != 7.4* && $PHP != $TRAVIS_PHP_VERSION && $TRAVIS_PULL_REQUEST != false ]]; then
261261
echo -e "\\n\\e[33;1mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"
262-
break
262+
return
263263
fi
264264
phpenv global $PHP
265265
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb)
@@ -311,10 +311,7 @@ install:
311311
fi
312312
fi
313313
}
314+
export -f run_tests
314315
315316
script:
316-
- for PHP in $TRAVIS_PHP_VERSION $php_extra; do
317-
(run_tests $PHP) || X=1;
318-
done
319-
320-
[[ ! $X ]] || (exit 1)
317+
echo $TRAVIS_PHP_VERSION $php_extra | xargs -n1 bash -c '(</dev/tty run_tests $0)' || false

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.