8000 Merge branch '2.8' into 3.0 · symfony/symfony@ecc03f5 · GitHub
[go: up one dir, main page]
Skip to content

Commit ecc03f5

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.0
* 2.8: [travis] fix Conflicts: .github/travis.php
2 parents 9c0ca19 + 949b6a4 commit ecc03f5

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

‎.github/travis.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
echo "Usage: branch version dir1 dir2 ... dirN\n";
55
exit(1);
66
}
7+
chdir(dirname(__DIR__));
78

89
$dirs = $_SERVER['argv'];
910
array_shift($dirs);
@@ -30,15 +31,15 @@
3031

3132
$package->repositories = array(array(
3233
'type' => 'composer',
33-
'url' => 'file://'.__DIR__.'/',
34+
'url' => 'file://'.dirname(__DIR__).'/',
3435
));
3536
$json = rtrim(json_encode(array('repositories' => $package->repositories), $flags), "\n}").','.substr($json, 1);
3637
file_put_contents($dir.'/composer.json', $json);
3738
passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *");
3839

39-
$package->version = 'master' !== $version ? $version.'.x-dev' : 'dev-master';
40+
$package->version = 'master' !== $version ? $version.'.999' : 'dev-master';
4041
$package->dist['type'] = 'tar';
41-
$package->dist['url'] = 'file://'.__DIR__."/$dir/package.tar";
42+
$package->dist['url'] = 'file://'.dirname(__DIR__)."/$dir/package.tar";
4243

4344
$packages[$package->name][$package->version] = $package;
4445

0 commit comments

Comments
 (0)
0