File tree 2 files changed +4
-4
lines changed
2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 54
54
echo "Missing \"branch-version \" in composer.json's \"extra \". \n" ;
55
55
exit (1 );
56
56
}
57
- $ package ->version = substr_replace ( $ package ->extra ->{'branch-version ' }, '.x-dev ' , - 4 ) ;
57
+ $ package ->version = $ package ->extra ->{'branch-version ' }. '.x-dev ' ;
58
58
$ package ->dist ['type ' ] = 'tar ' ;
59
59
$ package ->dist ['url ' ] = 'file:// ' .str_replace (DIRECTORY_SEPARATOR , '/ ' , dirname (__DIR__ ))."/ $ dir/package.tar " ;
60
60
Original file line number Diff line number Diff line change @@ -228,7 +228,7 @@ install:
228
228
git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
229
229
git rm -rq src/Symfony/Bridge/PhpUnit
230
230
git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
231
- export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"branch-version": *"[1-9]' | grep -o '[0-9.]*')
231
+ export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"branch-version". *"[1-9]' | grep -o '[0-9.]*')
232
232
sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
233
233
rm -rf .phpunit
234
234
fi
@@ -262,7 +262,7 @@ install:
262
262
git checkout -m FETCH_HEAD &&
263
263
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
264
264
else
265
- export SYMFONY_VERSION=$(cat composer.json | grep '^ *"branch-version": *"[1-9]' | grep -o '[0-9.]*')
265
+ export SYMFONY_VERSION=$(cat composer.json | grep '^ *"branch-version". *"[1-9]' | grep -o '[0-9.]*')
266
266
fi
267
267
268
268
- |
@@ -289,7 +289,7 @@ install:
289
289
290
290
- |
291
291
# Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one
292
- [[ $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
292
+ [[ $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
293
293
294
294
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
295
295
if [[ $deps ]]; then mv composer.json.phpunit composer.json; fi
You can’t perform that action at this time.
0 commit comments