From 958e3ead5d9f7268504f98402fd5d8bcf4872b5f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 1 Jan 2020 12:25:22 +0100 Subject: [PATCH] travis: rebuild base-chroot via build.sh not prepare.sh. --- common/travis/build.sh | 3 +++ common/travis/prepare.sh | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/travis/build.sh b/common/travis/build.sh index 31d1c58c10b..dc49e045a45 100755 --- a/common/travis/build.sh +++ b/common/travis/build.sh @@ -6,6 +6,9 @@ if [ "$1" != "$2" ]; then arch="-a $2" fi +# Make sure `base-chroot` is really up-to-date +/hostrepo/xbps-src -Ntf pkg base-chroot + PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates)) NPROCS=1 diff --git a/common/travis/prepare.sh b/common/travis/prepare.sh index 6390e7c5df5..04fff2a1392 100755 --- a/common/travis/prepare.sh +++ b/common/travis/prepare.sh @@ -13,6 +13,3 @@ echo XBPS_ALLOW_CHROOT_BREAKOUT=yes >> etc/conf /bin/echo -e '\x1b[32mLinking / to /masterdir...\x1b[0m' ln -s / masterdir - -# Make sure `base-chroot` is really up-to-date -/hostrepo/xbps-src -Ntf pkg base-chroot