Remove branch-version (keep them for contracts only)
This commit is contained in:
parent
85e8de6137
commit
f8fe4bf9f5
@ -56,7 +56,7 @@ install:
|
||||
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
|
||||
- git config --global user.email ""
|
||||
- git config --global user.name "Symfony"
|
||||
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
|
||||
- php .github/build-packages.php "HEAD^" %APPVEYOR_REPO_BRANCH% src\Symfony\Bridge\PhpUnit
|
||||
- SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev
|
||||
- php composer.phar config platform.php 5.5.9
|
||||
- php composer.phar update --no-progress --no-suggest --ansi
|
||||
|
9
.github/build-packages.php
vendored
9
.github/build-packages.php
vendored
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
if (3 > $_SERVER['argc']) {
|
||||
echo "Usage: branch dir1 dir2 ... dirN\n";
|
||||
echo "Usage: branch version dir1 dir2 ... dirN\n";
|
||||
exit(1);
|
||||
}
|
||||
chdir(dirname(__DIR__));
|
||||
@ -14,6 +14,7 @@ if ($json !== $package = preg_replace('/\n "repositories": \[\n.*?\n \],/s
|
||||
$dirs = $_SERVER['argv'];
|
||||
array_shift($dirs);
|
||||
$mergeBase = trim(shell_exec(sprintf('git merge-base "%s" HEAD', array_shift($dirs))));
|
||||
$version = array_shift($dirs);
|
||||
|
||||
$packages = array();
|
||||
$flags = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
|
||||
@ -50,11 +51,7 @@ foreach ($dirs as $k => $dir) {
|
||||
passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
|
||||
}
|
||||
|
||||
if (!isset($package->extra->{'branch-version'})) {
|
||||
echo "Missing \"branch-version\" in composer.json's \"extra\".\n";
|
||||
exit(1);
|
||||
}
|
||||
$package->version = $package->extra->{'branch-version'}.'.x-dev';
|
||||
$package->version = (isset($package->extra->{'branch-version'}) ? $package->extra->{'branch-version'} : $version).'.x-dev';
|
||||
$package->dist['type'] = 'tar';
|
||||
$package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
|
||||
|
||||
|
13
.travis.yml
13
.travis.yml
@ -85,7 +85,6 @@ before_install:
|
||||
$HOME/.phpenv/versions/7.1/bin/php $HOME/.phpenv/versions/7.1/bin/composer $*
|
||||
}
|
||||
export -f composer
|
||||
~/.phpenv/versions/7.1/bin/composer self-update
|
||||
fi
|
||||
|
||||
nanoseconds () {
|
||||
@ -211,7 +210,7 @@ install:
|
||||
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
|
||||
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"branch-version". *"[1-9]' | grep -o '[0-9.]*')
|
||||
export SYMFONY_VERSION=$(curl -s https://api.github.com/repos/symfony/symfony/pulls/$SYMFONY_PHPUNIT_BRIDGE_PR | jq -r .base.ref)
|
||||
sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
|
||||
rm -rf .phpunit
|
||||
fi
|
||||
@ -222,12 +221,12 @@ install:
|
||||
git config --global user.name "Symfony"
|
||||
|
||||
if [[ ! $deps ]]; then
|
||||
php .github/build-packages.php HEAD^ src/Symfony/Bridge/PhpUnit
|
||||
php .github/build-packages.php HEAD^ $TRAVIS_BRANCH src/Symfony/Bridge/PhpUnit
|
||||
else
|
||||
export SYMFONY_DEPRECATIONS_HELPER=weak &&
|
||||
cp composer.json composer.json.orig &&
|
||||
echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json &&
|
||||
php .github/build-packages.php HEAD^ $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | sort) &&
|
||||
php .github/build-packages.php HEAD^ $TRAVIS_BRANCH $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | sort) &&
|
||||
mv composer.json composer.json.phpunit &&
|
||||
mv composer.json.orig composer.json
|
||||
fi
|
||||
@ -240,12 +239,12 @@ install:
|
||||
# For the feature-branch, when deps=high, the version before it is checked out and tested with the locally patched components
|
||||
if [[ $deps = high && $TRAVIS_BRANCH = *.x ]]; then
|
||||
export FLIP='🙃'
|
||||
export SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//) &&
|
||||
export SYMFONY_VERSION=$(git ls-remote -q --heads | grep -o '/[1-9]\.[0-9].*' | tail -n 1 | sed s/.//) &&
|
||||
git fetch --depth=2 origin $SYMFONY_VERSION &&
|
||||
git checkout -m FETCH_HEAD &&
|
||||
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
|
||||
else
|
||||
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"branch-version". *"[1-9]' | grep -o '[0-9.]*')
|
||||
export SYMFONY_VERSION=$TRAVIS_BRANCH
|
||||
fi
|
||||
|
||||
- |
|
||||
@ -272,7 +271,7 @@ install:
|
||||
|
||||
- |
|
||||
# Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one
|
||||
[[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"branch-version". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]] && export LEGACY=,legacy
|
||||
[[ $deps = high && ${SYMFONY_VERSION%.*} != $(git ls-remote -q --heads | cut -f2 | grep -FA1 /$SYMFONY_VERSION | tail -n 1 | grep -o '[0-9]*') ]] && export LEGACY=,legacy
|
||||
|
||||
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
|
||||
if [[ $deps ]]; then mv composer.json.phpunit composer.json; fi
|
||||
|
@ -133,8 +133,5 @@
|
||||
"autoload-dev": {
|
||||
"files": [ "src/Symfony/Component/VarDumper/Resources/functions/dump.php" ]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -56,8 +56,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -42,8 +42,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -38,7 +38,6 @@
|
||||
],
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4",
|
||||
"thanks": {
|
||||
"name": "phpunit/phpunit",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit"
|
||||
|
@ -29,8 +29,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -66,8 +66,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -40,8 +40,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -90,8 +90,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -61,8 +61,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -50,8 +50,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -44,8 +44,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -34,8 +34,5 @@
|
||||
"symfony/monolog-bridge": "For using the log server.",
|
||||
"symfony/expression-language": "For using the filter option of the log server."
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -31,8 +31,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -32,8 +32,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -41,8 +41,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -31,8 +31,5 @@
|
||||
"exclude-from-classmap": [
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
}
|
||||
|
@ -39,8 +39,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -47,8 +47,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -28,8 +28,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -31,8 +31,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -46,8 +46,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -32,8 +32,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -27,8 +27,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -39,8 +39,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -26,8 +26,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -25,8 +25,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -24,8 +24,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -57,8 +57,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -29,8 +29,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -65,8 +65,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -32,8 +32,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -40,8 +40,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -27,8 +27,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -29,8 +29,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -24,8 +24,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -24,8 +24,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -32,8 +32,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -50,8 +50,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -45,8 +45,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -42,8 +42,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -36,8 +36,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -29,8 +29,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -43,8 +43,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -58,8 +58,5 @@
|
||||
"/Http/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -54,8 +54,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -24,8 +24,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -31,8 +31,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -45,8 +45,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -61,8 +61,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -38,8 +38,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -34,8 +34,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -34,8 +34,5 @@
|
||||
"autoload": {
|
||||
"psr-4": { "Symfony\\Component\\Workflow\\": "" }
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
@ -34,8 +34,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-version": "3.4"
|
||||
}
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
|
Reference in New Issue
Block a user