summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rwxr-xr-x[-rw-r--r--].travis/install10
2 files changed, 5 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 1725dc8..893b863 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ dist: xenial
sudo: required
language: minimal
install:
- - sudo sh .travis/install
+ - sudo .travis/install
script: |
. .travis/config
sudo chroot $NEWROOT su -l $USER sh -c "cd $CLONE_DIR; make LINKER_PATH=/lib/ld-musl-x86_64.so.1 LOADER_NAME=ld-linux-x86-64.so.2"
diff --git a/.travis/install b/.travis/install
index 87996af..d0b606f 100644..100755
--- a/.travis/install
+++ b/.travis/install
@@ -1,14 +1,14 @@
-#!/bin/sh
+#!/bin/sh -e
. $(dirname $0)/config
-curl -O https://mirrormaster.adelielinux.org/adelie/apk-tools-static/x86_64.apk
+curl -O https://distfiles.adelielinux.org/adelie/apk-tools-static/x86_64.apk
tar -xzOf x86_64.apk sbin/apk.static > /tmp/apk.static
mkdir -p "$NEWROOT"/etc/apk
/tmp/apk.static -X "https://mirrormaster.adelielinux.org/adelie/current/system" --root "$NEWROOT" --initdb --no-progress add adelie-core bash-binsh musl-dev gcc binutils
-pushd "$NEWROOT"
+cd "$NEWROOT"
mount -t proc none proc
mount -t sysfs none sys
@@ -17,6 +17,4 @@ mount -R /run run
ln -s /run/shm dev/shm
mkdir ./$CLONE_DIR
mount -B $CLONE_DIR ./$CLONE_DIR
-useradd -m -c "Travis User" -s /bin/sh -G wheel -u $SUDO_UID $SUDO_USER
-
-popd
+chroot "$NEWROOT" useradd -m -c "Travis User" -s /bin/sh -G wheel -u $SUDO_UID $SUDO_USER