diff --git a/.travis.yml b/.travis.yml index 8c7a05ed3d9..865e60ec2f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: bash -sudo: false +dist: trusty +sudo: required git: depth: 200 diff --git a/common/travis/prepare.sh b/common/travis/prepare.sh index 2fbfdc7b637..985f96d2a34 100755 --- a/common/travis/prepare.sh +++ b/common/travis/prepare.sh @@ -4,20 +4,19 @@ mkdir -p $HOME/bin -/bin/echo -e '\x1b[32mInstalling proot...\x1b[0m' -wget -q http://static.proot.me/proot-x86_64 -install -m 755 proot-x86_64 $HOME/bin/proot || exit 1 - /bin/echo -e '\x1b[32mInstalling xbps...\x1b[0m' wget -q -O - http://repo.voidlinux.eu/static/xbps-static-latest.x86_64-musl.tar.xz | \ unxz | tar x -C $HOME/bin --wildcards "./usr/bin/xbps-*" \ --strip-components=3 || exit 1 +sudo chown root $HOME/bin/xbps-uchroot +sudo chmod u+s $HOME/bin/xbps-uchroot + /bin/echo -e '\x1b[32mInstalling xtools...\x1b[0m' wget -q -O - https://github.com/chneukirchen/xtools/archive/master.tar.gz | \ gunzip | tar x -C $HOME/bin --wildcards "xtools-master/x*" \ --strip-components=1 || exit 1 /bin/echo -e '\x1b[32mUpdating etc/conf...\x1b[0m' -echo XBPS_CHROOT_CMD=proot >> etc/conf +echo XBPS_CHROOT_CMD=uchroot >> etc/conf echo XBPS_MAKEJOBS=4 >> etc/conf