From 3c75453c0ced46dcaa7102737f4856f0d9f4ec56 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 10 Oct 2022 14:17:05 -0400 Subject: [PATCH] common/travis/: add bootstrap repo to CI scripts --- common/travis/check-install.sh | 4 +++- common/travis/show_files.sh | 3 ++- common/travis/xpkgdiff.sh | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh index d9725670002..b5268085db5 100755 --- a/common/travis/check-install.sh +++ b/common/travis/check-install.sh @@ -9,7 +9,9 @@ if [ "$1" != "$XBPS_TARGET_ARCH" ]; then ROOTDIR="-r /usr/$triplet" fi -ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree" +ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap + --repository=$HOME/hostdir/binpkgs + --repository=$HOME/hostdir/binpkgs/nonfree" while read -r pkg; do for subpkg in $(xsubpkg $pkg); do diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh index 8799ed52e1e..c8de93a9aba 100755 --- a/common/travis/show_files.sh +++ b/common/travis/show_files.sh @@ -7,7 +7,8 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo while read -r pkg; do for subpkg in $(xsubpkg $pkg); do /bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m" - xbps-query --repository=$HOME/hostdir/binpkgs \ + xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \ + --repository=$HOME/hostdir/binpkgs \ --repository=$HOME/hostdir/binpkgs/nonfree \ -i -f "$subpkg" || /bin/echo -e "\x1b[33m $subpkg wasn't found\x1b[0m" diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh index 6450a6c0889..ce042c1628b 100755 --- a/common/travis/xpkgdiff.sh +++ b/common/travis/xpkgdiff.sh @@ -9,7 +9,8 @@ ARGS="-a $2 -R https://repo-ci.voidlinux.org/current" while read -r pkg; do for subpkg in $(xsubpkg $pkg); do - if xbps-query --repository=$HOME/hostdir/binpkgs \ + if xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \ + --repository=$HOME/hostdir/binpkgs \ --repository=$HOME/hostdir/binpkgs/nonfree \ -i "$subpkg" >&/dev/null; then /bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"