From 8af3db34fd3d041ae7b264a2056a8aea79482f7c Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Fri, 15 Jun 2018 00:17:38 +0200 Subject: [PATCH] update gitlab-ci --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21129795e..3d28f9379 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -556,11 +556,10 @@ Linux client archlinux build: image: base/archlinux script: # Prepare environment + - pacman -Syyu --noconfirm pacman-contrib - cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.backup - curl -o /etc/pacman.d/mirrorlist.new https://www.archlinux.org/mirrorlist/all/ - sed -i 's/^#Server/Server/' /etc/pacman.d/mirrorlist.new - - ls /usr/bin/* - - pacman -Syyu --noconfirm pacman-contrib - rankmirrors -n 6 /etc/pacman.d/mirrorlist.new > /etc/pacman.d/mirrorlist - pacman -Syyu - pacman -S --noconfirm @@ -618,6 +617,7 @@ Linux client archlinux build: - yaourt -Syyu --noconfirm --aur boost-build # Apply patch - (for patchfile in $(cat patch/series); do if ! patch -Z -t -R -s -f --dry-run -p 1 -i patch/$patchfile; then patch -f -Z -t -p 1 -i patch/$patchfile || exit 2 ; fi;done) + - patch -f -Z -t -p 1 -i patch/02_archlinux_allocator_static_assert_error.patch # Build - mkdir -p luabind - wget -q http://http.debian.net/debian/pool/main/l/luabind/luabind_0.9.1+dfsg.orig.tar.gz -O luabind.tar.gz @@ -625,7 +625,6 @@ Linux client archlinux build: - tar xvf luabind.tar.gz -C luabind --strip 1 || exit 2 - tar xvf luabind-debian.tar.xz -C luabind || exit 2 - cd luabind - - ls -l - for file in $(cat debian/patches/series); do patch -p1 < debian/patches/$file; done - export -p DEB_HOST_MULTIARCH="/"; bjam -d2 release debug install cxxflags="-fPIC -Wno-deprecated -Wno-deprecated-declarations" - export -p DEB_HOST_MULTIARCH="/"; bjam -d2 release debug install link=static cxxflags="-fPIC -Wno-deprecated -Wno-deprecated-declarations"