Set branch name to travis_branch + create folders on the fly (#1480)

This commit is contained in:
jekkos
2017-08-18 18:05:51 +02:00
parent 833490c9a3
commit 6a65618e82
2 changed files with 7 additions and 2 deletions

View File

@@ -9,10 +9,10 @@ before_install:
- curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin
- date=`date +%Y%m%d%H%M%S` && branch=`git rev-parse --abbrev-ref HEAD` && rev=`git rev-parse --short=6 HEAD` && sed -i "s/\$1/\$1.$date.$branch.$rev/g" deployment.json
- date=`date +%Y%m%d%H%M%S` && branch=${TRAVIS_BRANCH} && rev=`git rev-parse --short=6 HEAD` && sed -i "s/\$1/\$1.$date.$branch.$rev/g" deployment.json
script:
- docker run --rm -v $(pwd):/app composer/composer install
- sudo php bin/install.php translations develop
- php bin/install.php translations develop
- docker run --rm -it -v $(pwd):/app -w /app digitallyseamless/nodejs-bower-grunt sh -c "npm install && bower install && grunt package"
- docker-compose build
env:

View File

@@ -255,6 +255,11 @@ class Installer
if ($file->isDir()) {
@mkdir($dst . '/' . $iterator->getSubPathName());
} else {
if (!is_dir($dst))
{
@mkdir($dst);
}
$success = copy($file, $dst . '/' . $iterator->getSubPathName());
if ($success) {
echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;