Skip to content

Commit 78b1b29

Browse files
[travis] checkout previous major and test with patched components on deps=high
1 parent 27a4002 commit 78b1b29

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ install:
4545
- cd c:\projects\symfony
4646
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.9.0/composer.phar)
4747
- php composer.phar self-update
48-
- copy /Y .composer\* %APPDATA%\Composer\
48+
- copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
4949
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
5050
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
5151
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
File renamed without changes.

.travis.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ before_install:
7272
fi
7373
slapd -f src/Symfony/Component/Ldap/Tests/Fixtures/conf/slapd.conf -h ldap://localhost:3389 &
7474
[ -d ~/.composer ] || mkdir ~/.composer
75-
cp .composer/* ~/.composer/
75+
cp .github/composer-config.json ~/.composer/config.json
7676
export PHPUNIT=$(readlink -f ./phpunit)
7777
export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"
7878
export COMPOSER_UP='composer update --no-progress --no-suggest --ansi'
@@ -192,7 +192,7 @@ install:
192192
#SYMFONY_PHPUNIT_BRIDGE_PR=32886
193193
194194
if [[ $SYMFONY_PHPUNIT_BRIDGE_PR ]]; then
195-
git fetch origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
195+
git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
196196
git rm -rq src/Symfony/Bridge/PhpUnit
197197
git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
198198
SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
@@ -221,7 +221,7 @@ install:
221221
# For the master branch, when deps=high, the version before master is checked out and tested with the locally patched components
222222
if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then
223223
SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//) &&
224-
git fetch origin $SYMFONY_VERSION &&
224+
git fetch --depth=2 origin $SYMFONY_VERSION &&
225225
git checkout -m FETCH_HEAD &&
226226
COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
227227
else
@@ -261,11 +261,26 @@ install:
261261
break
262262
fi
263263
phpenv global $PHP
264-
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb)
264+
([[ $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)
265265
tfold 'composer update' $COMPOSER_UP
266266
tfold 'phpunit install' ./phpunit install
267267
if [[ $deps = high ]]; then
268268
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP --prefer-source && $PHPUNIT_X$LEGACY'"
269+
(cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json)
270+
COMPONENTS=$(git diff --name-only src/ | grep composer.json)
271+
272+
if [[ $COMPONENTS && $LEGACY && $TRAVIS_PULL_REQUEST != false ]]; then
273+
COMPONENTS=$(echo "$COMPONENTS" | xargs dirname | sort)
274+
echo "$COMPONENTS" | parallel --gnu "cd {} && rm composer.lock vendor/ -Rf"
275+
SYMFONY_VERSION=$(echo $SYMFONY_VERSION | awk '{print $1 - 1}')
276+
export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
277+
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
278+
echo -e "\\n\\e[1;34mChecking out Symfony $SYMFONY_VERSION and running tests with patched components as deps.\\e[0m"
279+
git fetch --depth=2 origin $SYMFONY_VERSION &&
280+
git checkout -m FETCH_HEAD &&
281+
(cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb)
282+
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP --prefer-source && $PHPUNIT_X$LEGACY'"
283+
fi
269284
elif [[ $deps = low ]]; then
270285
[[ -e ~/php-ext/composer-lowest.lock.tar ]] && tar -xf ~/php-ext/composer-lowest.lock.tar
271286
tar -cf ~/php-ext/composer-lowest.lock.tar --files-from /dev/null

0 commit comments

Comments
 (0)