diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b35c1b1..a681f69 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,8 @@ stages: build: stage: build + cache: {} script: - apt-get update && apt-get install -y wget sudo - MOUNTBIN=`which mount` && rm -f $MOUNTBIN && ln -sf `which echo` $MOUNTBIN - - mkdir "/alpine$(pwd)" && cp build "/alpine$(pwd)" - FORCE_EXEC=1 bash install-and-chroot.sh diff --git a/install-and-chroot.sh b/install-and-chroot.sh index d66b9bd..6b0b8e1 100755 --- a/install-and-chroot.sh +++ b/install-and-chroot.sh @@ -39,7 +39,7 @@ fi sudo sed -e 's/#rc_sys=""/rc_sys="prefix"/g' -i "$DIR/etc/rc.conf" # Launch chroot -sh $DIR/enter-chroot ./build || exit 1 +cp build $DIR/build && sh $DIR/enter-chroot /build || pwd # Insert pkg++ configuration in chroot sudo mkdir -p "$DIR/opt/pkgxx/dev" && \