Merge branch 'master' into php5

* master:
  Use a variable for subfolder string.
  Use branch name as a subfolder for code coverage reports.
This commit is contained in:
Andreas Fischer 2013-11-23 21:19:11 +01:00
commit 924bec8058

View File

@ -24,11 +24,12 @@ fi
# Workaround for rsync not creating target directories with depth > 1 # Workaround for rsync not creating target directories with depth > 1
mv "$LDIRNAME" "x$LDIRNAME" mv "$LDIRNAME" "x$LDIRNAME"
mkdir -p "$RDIRNAME/$TRAVIS_BUILD_NUMBER" RROOT="$RDIRNAME/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER"
mv "x$LDIRNAME" "$RDIRNAME/$TRAVIS_BUILD_NUMBER/PHP-$TRAVIS_PHP_VERSION/" mkdir -p "$RROOT"
mv "x$LDIRNAME" "$RROOT/PHP-$TRAVIS_PHP_VERSION/"
# Update latest symlink # Update latest symlink
ln -s "$TRAVIS_BUILD_NUMBER" "$RDIRNAME/latest" ln -s "$TRAVIS_BUILD_NUMBER" "$RDIRNAME/$TRAVIS_BRANCH/latest"
# Stop complaints about world-readable key file. # Stop complaints about world-readable key file.
chmod 600 "$ID_RSA" chmod 600 "$ID_RSA"