From 1de84836cfb2fd78c514229fdc5d79719da5c323 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 20 Sep 2019 18:57:15 +0200 Subject: [PATCH] [travis] install from dist except for selected components --- .appveyor.yml | 2 +- .composer/config.json | 7 ------- .github/composer-config.json | 10 ++++++++++ .travis.yml | 21 +++++++++++++-------- 4 files changed, 24 insertions(+), 16 deletions(-) delete mode 100644 .composer/config.json create mode 100644 .github/composer-config.json diff --git a/.appveyor.yml b/.appveyor.yml index b5fcad5e9b..5146a65ae6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -52,7 +52,7 @@ install: - cd c:\projects\symfony - IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.9.0/composer.phar) - php composer.phar self-update - - copy /Y .composer\* %APPDATA%\Composer\ + - copy /Y .github\composer-config.json %APPDATA%\Composer\config.json - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master - php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit - IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev) diff --git a/.composer/config.json b/.composer/config.json deleted file mode 100644 index 941bc3b56e..0000000000 --- a/.composer/config.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "config": { - "preferred-install": { - "*": "dist" - } - } -} diff --git a/.github/composer-config.json b/.github/composer-config.json new file mode 100644 index 0000000000..185292ab21 --- /dev/null +++ b/.github/composer-config.json @@ -0,0 +1,10 @@ +{ + "config": { + "preferred-install": { + "symfony/form": "source", + "symfony/http-kernel": "source", + "symfony/validator": "source", + "*": "dist" + } + } +} diff --git a/.travis.yml b/.travis.yml index f6bada9846..dfa3300974 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ before_install: mkdir /tmp/slapd slapd -f src/Symfony/Component/Ldap/Tests/Fixtures/conf/slapd.conf -h ldap://localhost:3389 & [ -d ~/.composer ] || mkdir ~/.composer - cp .composer/* ~/.composer/ + cp .github/composer-config.json ~/.composer/config.json export PHPUNIT=$(readlink -f ./phpunit) export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data" export COMPOSER_UP='composer update --no-progress --no-suggest --ansi' @@ -95,7 +95,7 @@ before_install: # tfold is a helper to create folded reports tfold () { - local title="🐘 $PHP $1" + local title="🐘 $PHP $1 $FLIP" local fold=$(echo $title | sed -r 's/[^-_A-Za-z0-9]+/./g') shift local id=$(printf %08x $(( RANDOM * RANDOM ))) @@ -202,7 +202,7 @@ install: #SYMFONY_PHPUNIT_BRIDGE_PR=32886 if [[ $SYMFONY_PHPUNIT_BRIDGE_PR ]]; then - git fetch origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head + git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head git rm -rq src/Symfony/Bridge/PhpUnit git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*') @@ -230,8 +230,9 @@ install: - | # For the master branch, when deps=high, the version before master is checked out and tested with the locally patched components if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then + export FLIP='🙃' SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//) && - git fetch origin $SYMFONY_VERSION && + git fetch --depth=2 origin $SYMFONY_VERSION && git checkout -m FETCH_HEAD && COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n' | sort) else @@ -269,7 +270,7 @@ install: set -e export PHP=$1 if [[ $PHP != $TRAVIS_PHP_VERSION && $TRAVIS_PULL_REQUEST != false ]]; then - echo -e "\\n\\e[1;34mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m" + echo -e "\\n\\e[33;1mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m" break fi phpenv global ${PHP/hhvm*/hhvm} @@ -283,12 +284,12 @@ install: tfold 'phpunit install' ./phpunit install fi if [[ $deps = high ]]; then - echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP --prefer-source && $PHPUNIT_X$LEGACY'" + echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'" elif [[ $deps = low ]]; then [[ -e ~/php-ext/composer-lowest.lock.tar ]] && tar -xf ~/php-ext/composer-lowest.lock.tar tar -cf ~/php-ext/composer-lowest.lock.tar --files-from /dev/null php .github/rm-invalid-lowest-lock-files.php $COMPONENTS - echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable --prefer-source) && $PHPUNIT_X'" + echo "$COMPONENTS" | parallel --gnu "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 @@ -304,4 +305,8 @@ install: } script: - - for PHP in $TRAVIS_PHP_VERSION $php_extra; do (run_tests $PHP); done + - for PHP in $TRAVIS_PHP_VERSION $php_extra; do + (run_tests $PHP) || X=1; + done + + [[ ! $X ]] || (exit 1)