From 7b5a49260aebc76b6e860dd75bfffff0b16f7724 Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Thu, 22 Mar 2018 00:51:41 +0100 Subject: [PATCH] reduce build for "Linux client build", detect correct version patch for libvorbis --- .gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c99ca21d6..b7f494a94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,7 @@ # along with this program. If not, see . # # Example to execute locally: +# gitlab-runner exec docker --timeout=3600 'Linux client build' # gitlab-runner exec docker --timeout=3600 'Linux server debian_amd64_strech build' # gitlab-runner exec docker --timeout=3600 'Linux client debian_amd64_strech build' # gitlab-runner exec docker --timeout=3600 'Linux client_static debian_amd64_strech build' @@ -68,7 +69,10 @@ Linux client build: # Configuration - cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/ -DCMAKE_BUILD_TYPE=Release -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON -DWITH_STATIC_EXTERNAL=ON -DWITH_UNIX_STRUCTURE=OFF -DWITH_INSTALL_LIBRARIES=OFF -DWITH_LUA52=ON ../../code # Compilation et installation - - make $optionproc install DESTDIR=../../Linux/x86_64 + - make $optionproc khanat_client_patcher khanat_client + #- make $optionproc install DESTDIR=../../Linux/x86_64 + - mkdir -p ../../Linux/x86_64 + - cp bin/* ../../Linux/x86_64 # Packaging - cd ../../ - cp ./dist/khanat/autoextract_script.sh ./Linux/x86_64/ @@ -288,7 +292,7 @@ Linux client_static debian_amd64_strech build: - mkdir -p libvorbis - wget -q http://security.debian.org/debian-security/pool/updates/main/libv/libvorbis/libvorbis_1.3.5.orig.tar.gz -O libvorbis.tar.gz - tar xvf libvorbis.tar.gz -C libvorbis --strip 1 || exit 2 - - wget -q http://security.debian.org/debian-security/pool/updates/main/libv/libvorbis/libvorbis_1.3.5-4+deb9u1.debian.tar.xz -O libvorbis.debian.tar.xz + - subversion=1; code=1; while [ $code -ne 0 ] ; do wget -q http://security.debian.org/debian-security/pool/updates/main/libv/libvorbis/libvorbis_1.3.5-4+deb9u$subversion.debian.tar.xz -O libvorbis.debian.tar.xz; code=$? subversion=$(( $subversion + 1 )) ; done ; echo "GET libvorbis_1.3.5-4+deb9u$(( $subversion - 1)).debian.tar.xz" - tar xvf libvorbis.debian.tar.xz -C libvorbis || exit 2 - cd libvorbis - for file in $(cat debian/patches/series); do patch -p1 < debian/patches/$file; done