From 893c14e6f4f4f60add0e6c71e0b8e5bfaf2f96bf Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Mon, 17 Sep 2018 21:37:46 +0200 Subject: [PATCH] remove expiration on artefact and concat apt-get install --- .gitlab-ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05b6880..f33ea4e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,12 +32,7 @@ Linux server build: - export -p WORKDIR=$PWD - apt-get update - apt-get dist-upgrade -y - - apt-get install -y bash-completion bsd-mailx cron curl debootstrap fakechroot fakeroot git jq less logrotate lzma nano net-tools openssh-server p7zip p7zip-full schroot sudo unzip vim wget xdelta python3-pip python3-bcrypt -# - apt-get install -y libcurl4-openssl libfreetype6 libx11 libgl1-mesa libxxf86vm libxrandr libxrender libopenal libxml2 libpng libjpeg62-turbo libxmu libgif libssl liblzma zlib1g libssh2-1 libboost-all libopenal libgl1-mesa libtool libxml2 - - apt-get install -y libxml2 libpng16-16 libjpeg62-turbo libxmu6 libgif7 libssl1.1 liblzma5 zlib1g libssh2-1 libtool libxml2 - - DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server - - apt-get install -y apache2 apache2-utils libapache2-mod-php mcrypt php php-gd php-imagick php-mcrypt php-mysql python3 rrdtool screen - - DEBIAN_FRONTEND=noninteractive apt-get install -y phpmyadmin + - DEBIAN_FRONTEND=noninteractive apt-get install -y bash-completion bsd-mailx cron curl debootstrap fakechroot fakeroot git jq less logrotate lzma nano net-tools openssh-server p7zip p7zip-full schroot sudo unzip vim wget xdelta python3-pip python3-bcrypt libxml2 libpng16-16 libjpeg62-turbo libxmu6 libgif7 libssl1.1 liblzma5 zlib1g libssh2-1 libtool libxml2 mysql-server apache2 apache2-utils libapache2-mod-php mcrypt php php-gd php-imagick php-mcrypt php-mysql python3 rrdtool screen phpmyadmin phpmyadmin - mkdir -p /opt/download - export -p DIR_ARTEFACTS="/opt/download" - (cd /opt/download ; $WORKDIR/server/common/download_artefacts.sh 'https://git.khaganat.net' 'khaganat' 'mmorpg_khanat/khanat-opennel-code' $CI_COMMIT_REF_NAME 'develop' 'master') @@ -102,5 +97,3 @@ Linux server build: name: "khanat-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-server-debian-stretch" paths: - khanat-debian-server.tar.gz - expire_in: 2 week -