@@ -55,6 +55,7 @@ before_install:
55
55
export COMPOSER_UP='composer update --no-progress --ansi'
56
56
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
57
57
export SYMFONY_DEPRECATIONS_HELPER=max[indirect]=170
58
+ export SYMFONY_FEATURE_BRANCH=$(curl -s https://flex.symfony.com/versions.json | jq -r '."dev-name"')
58
59
59
60
nanoseconds () {
60
61
local cmd="date"
@@ -201,7 +202,7 @@ install:
201
202
202
203
- |
203
204
# For the feature-branch, when deps=high, the version before it is checked out and tested with the locally patched components
204
- if [[ $deps = high && $TRAVIS_BRANCH = *.x ]]; then
205
+ if [[ $deps = high && $TRAVIS_BRANCH = $SYMFONY_FEATURE_BRANCH ]]; then
205
206
export FLIP='^'
206
207
export SYMFONY_VERSION=$(echo "$SYMFONY_VERSIONS" | grep -o '/[1-9]\.[0-9].*' | tail -n 1 | sed s/.//) &&
207
208
git fetch --depth=2 origin $SYMFONY_VERSION &&
@@ -211,7 +212,7 @@ install:
211
212
212
213
- |
213
214
# Skip the phpunit-bridge on bugfix-branches when $deps is empty
214
- if [[ ! $deps && ! $TRAVIS_BRANCH = *.x ]]; then
215
+ if [[ ! $deps && ! $TRAVIS_BRANCH = $SYMFONY_FEATURE_BRANCH ]]; then
215
216
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
216
217
fi
217
218
@@ -263,7 +264,7 @@ install:
263
264
(cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json)
264
265
COMPONENTS=$(git diff --name-only src/ | grep composer.json || true)
265
266
266
- if [[ $COMPONENTS && $LEGACY && ! $TRAVIS_BRANCH = *.x && $TRAVIS_PULL_REQUEST != false && $(echo "$SYMFONY_VERSIONS" | cut -f2 | grep -FA1 /$SYMFONY_VERSION | tail -n 1) = *.x ]]; then
267
+ if [[ $COMPONENTS && $LEGACY && ! $TRAVIS_BRANCH = $SYMFONY_FEATURE_BRANCH && $TRAVIS_PULL_REQUEST != false && $(echo "$SYMFONY_VERSIONS" | cut -f2 | grep -FA1 /$SYMFONY_VERSION | tail -n 1) = $SYMFONY_FEATURE_BRANCH ]]; then
267
268
export FLIP='^'
268
269
SYMFONY_VERSION=$(echo $SYMFONY_VERSION | awk '{print $1 - 1}')
269
270
echo -e "\\n\\e[33;1mChecking out Symfony $SYMFONY_VERSION and running tests with patched components as deps\\e[0m"
0 commit comments