aboutsummaryrefslogtreecommitdiff
path: root/common/travis
diff options
context:
space:
mode:
authormhmdanas <triallax@tutanota.com>2023-04-06 18:06:26 +0000
committerclassabbyamp <5366828+classabbyamp@users.noreply.github.com>2023-04-11 20:16:00 +0000
commit9df91d9a2b30973ca88b3dc76bf56e10933616c2 (patch)
treece440706b16caebf4fecb405e88cc076165e51ec /common/travis
parentd2567b3d56f5544db71cfa88459f5ad6b5440c4c (diff)
downloadvoid-packages-9df91d9a2b30973ca88b3dc76bf56e10933616c2.tar
void-packages-9df91d9a2b30973ca88b3dc76bf56e10933616c2.tar.gz
void-packages-9df91d9a2b30973ca88b3dc76bf56e10933616c2.tar.bz2
void-packages-9df91d9a2b30973ca88b3dc76bf56e10933616c2.tar.lz
void-packages-9df91d9a2b30973ca88b3dc76bf56e10933616c2.tar.xz
void-packages-9df91d9a2b30973ca88b3dc76bf56e10933616c2.tar.zst
void-packages-9df91d9a2b30973ca88b3dc76bf56e10933616c2.zip
common/travis: make check-install use clean rootdir.
The CI has `base-chroot` installed, but sometimes this script would try to install `base-system,` causing conflicts. This commit fixes that issue by using a brand-new rootdir.
Diffstat (limited to 'common/travis')
-rwxr-xr-xcommon/travis/check-install.sh16
1 files changed, 13 insertions, 3 deletions
diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index 943a6bc6211..31dd104f1df 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -6,20 +6,30 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
triplet="$(/hostrepo/xbps-src -a "$XBPS_TARGET_ARCH" show-var XBPS_CROSS_TRIPLET)"
- ROOTDIR="-r /usr/$triplet"
+ CONFDIR="-C /usr/$triplet/etc/xbps.d"
+else
+ CONFDIR="-C /etc/xbps.d"
fi
+mkdir /check-install
+
+mkdir -p /check-install/var/db/xbps/keys
+cp /var/db/xbps/keys/* /check-install/var/db/xbps/keys/
+
ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
--repository=$HOME/hostdir/binpkgs
--repository=$HOME/hostdir/binpkgs/nonfree"
+ROOTDIR="-r /check-install"
+
+xbps-install $ROOTDIR $ADDREPO $CONFDIR -S
while read -r pkg; do
for subpkg in $(xsubpkg $pkg); do
/bin/echo -e "\x1b[32mTrying to install dependants of $subpkg:\x1b[0m"
for dep in $(xbps-query $ADDREPO -RX "$subpkg"); do
xbps-install \
- $ROOTDIR $ADDREPO \
- -Sny \
+ $ROOTDIR $ADDREPO $CONFDIR \
+ -ny \
"$subpkg" "$(xbps-uhelper getpkgname "$dep")"
ret="$?"
if [ "$ret" -eq 8 ] || [ "$ret" -eq 11 ]; then