8000 Fix .github/build-packages.php · symfony/symfony@84887f2 · GitHub
[go: up one dir, main page]

Skip to content

Commit 84887f2

Browse files
Fix .github/build-packages.php
1 parent 44a7e3e commit 84887f2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/build-packages.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
echo "Missing \"branch-version\" in composer.json's \"extra\".\n";
5555
exit(1);
5656
}
57-
$package->version = substr_replace($package->extra->{'branch-version'}, '.x-dev', -4);
57+
$package->version = $package->extra->{'branch-version'}.'.x-dev';
5858
$package->dist['type'] = 'tar';
5959
$package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
6060

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ install:
228228
git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
229229
git rm -rq src/Symfony/Bridge/PhpUnit
230230
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.]*')
232232
sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
233233
rm -rf .phpunit
234234
fi
@@ -262,7 +262,7 @@ install:
262262
git checkout -m FETCH_HEAD &&
263263
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
264264
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.]*')
266266
fi
267267
268268
- |
@@ -289,7 +289,7 @@ install:
289289
290290
- |
291291
# 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
293293
294294
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
295295
if [[ $deps ]]; then mv composer.json.phpunit composer.json; fi

0 commit comments

Comments
 (0)
0