From 163ab983b0a91dd363b9002a8bcc725feabe6af2 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 10 Apr 2015 13:31:24 +0200 Subject: [PATCH] common/travis: put hostdir in $HOME. simplifies caching. --- .travis.yml | 2 +- common/travis/bootstrap.sh | 9 +-------- common/travis/build.sh | 2 +- common/travis/show_files.sh | 2 +- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cba68816a6..295e53d1504 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ env: - ARCH=armv7hf cache: directories: - - $HOME/repocache + - $HOME/hostdir/repocache before_cache: - mv hostdir/repocache/* $HOME/repocache diff --git a/common/travis/bootstrap.sh b/common/travis/bootstrap.sh index 70dbc1335ee..14af57062ba 100755 --- a/common/travis/bootstrap.sh +++ b/common/travis/bootstrap.sh @@ -2,11 +2,4 @@ # # bootstrap.sh -mkdir -p hostdir/repocache -if [ -d $HOME/repocache ]; then - ln $HOME/repocache/* hostdir/repocache; -else - mkdir -p $HOME/repocache -fi - -./xbps-src binary-bootstrap +./xbps-src -H $HOME/hostdir binary-bootstrap diff --git a/common/travis/build.sh b/common/travis/build.sh index 95e67fb11c5..3554113d0d5 100755 --- a/common/travis/build.sh +++ b/common/travis/build.sh @@ -7,7 +7,7 @@ if [ "$1" != x86_64 ]; then fi for pkg in $(cat /tmp/templates); do - ./xbps-src $arch -C pkg "$pkg" + ./xbps-src -H $HOME/hostdir $arch -C pkg "$pkg" [ $? -eq 1 ] && exit 1 done diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh index 77c3986019e..2f3e26d40f4 100755 --- a/common/travis/show_files.sh +++ b/common/travis/show_files.sh @@ -5,7 +5,7 @@ for pkg in $(cat /tmp/templates); do for subpkg in $(xsubpkg $pkg); do /bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m" - ./xbps-src show-files "$pkg" + ./xbps-src -H $HOME/hostdir show-files "$pkg" done done