Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

update image use to build

Browse source
This commit is contained in:
AleaJactaEst 2018-11-30 19:54:27 +01:00
parent 8091bc8fb1
commit ab279d1c76
1 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
.gitlab-ci.yml
View file

@ -52,9 +52,9 @@ Linux client build:
- echo "disableproc:$disableproc, nb core compile:$(nproc --ignore=$disableproc) optionproc:$optionproc" - echo "disableproc:$disableproc, nb core compile:$(nproc --ignore=$disableproc) optionproc:$optionproc"
# Installation des dépendances # Installation des dépendances
#- echo "deb http://ftp.debian.org/debian/ jessie-backports non-free contrib main" >> /etc/apt/sources.list #- echo "deb http://ftp.debian.org/debian/ jessie-backports non-free contrib main" >> /etc/apt/sources.list
- apt-get update - DEBIAN_FRONTEND=noninteractive apt-get update
- apt-get -y upgrade - DEBIAN_FRONTEND=noninteractive apt-get upgrade -y
- apt-get install libxml2 -y g++ gcc cmake libcurl4-openssl-dev libgl1-mesa-dev libjpeg-dev libpng-dev libopenal-dev libfreetype6-dev libxxf86vm-dev libxrandr-dev libxrender-dev libvorbis-dev libluabind-dev libboost-dev libmysqlclient-dev libssl-dev liblzma-dev libxml2-dev makeself libgif-dev patch - DEBIAN_FRONTEND=noninteractive apt-get install libxml2 -y g++ gcc cmake libcurl4-openssl-dev libgl1-mesa-dev libjpeg-dev libpng-dev libopenal-dev libfreetype6-dev libxxf86vm-dev libxrandr-dev libxrender-dev libvorbis-dev libluabind-dev libboost-dev libmysqlclient-dev libssl-dev liblzma-dev libxml2-dev makeself libgif-dev patch
# Installation des dépendances des dépendances statiques (à commenter si construction de Khanat en mode dynamique) # Installation des dépendances des dépendances statiques (à commenter si construction de Khanat en mode dynamique)
# libxml2 : python-pyicu (support d'unicode), python-dev (support de... python) # libxml2 : python-pyicu (support d'unicode), python-dev (support de... python)
- apt-get install -y wget python-pyicu python-dev - apt-get install -y wget python-pyicu python-dev
@ -100,10 +100,9 @@ Linux server debian_amd64_strech build:
image: amd64/debian:9 image: amd64/debian:9
script: script:
# Prepare environment # Prepare environment
- apt-get update - DEBIAN_FRONTEND=noninteractive apt-get update
- apt-get dist-upgrade -y - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
- DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server - DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server
- apt-get install -y
git git
libcurl4-openssl-dev libcurl4-openssl-dev
libfreetype6-dev libfreetype6-dev
@ -188,8 +187,8 @@ Linux client debian_amd64_strech build:
image: amd64/debian:9 image: amd64/debian:9
script: script:
# Prepare environment # Prepare environment
- apt-get update - DEBIAN_FRONTEND=noninteractive apt-get update
- apt-get dist-upgrade -y - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
- apt-get install -y autoconf - apt-get install -y autoconf
autogen autogen
automake automake
@ -254,8 +253,8 @@ Linux client_static debian_amd64_strech build:
image: amd64/debian:9 image: amd64/debian:9
script: script:
# Prepare environment # Prepare environment
- apt-get update - DEBIAN_FRONTEND=noninteractive apt-get update
- apt-get dist-upgrade -y - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
- apt-get install -y - apt-get install -y
autoconf autoconf
autogen autogen
@ -363,8 +362,8 @@ Linux client_static_debug debian_amd64_strech build:
image: amd64/debian:9 image: amd64/debian:9
script: script:
# Prepare environment # Prepare environment
- apt-get update - DEBIAN_FRONTEND=noninteractive apt-get update
- apt-get dist-upgrade -y - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
- apt-get install -y - apt-get install -y
autoconf autoconf
autogen autogen
@ -472,8 +471,8 @@ Linux server_static debian_amd64_strech build:
image: amd64/debian:9 image: amd64/debian:9
script: script:
# Prepare environment # Prepare environment
- apt-get update - DEBIAN_FRONTEND=noninteractive apt-get update
- apt-get dist-upgrade -y - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
- DEBIAN_FRONTEND=noninteractive apt-get install -y apache2 apache2-utils autoconf autogen automake bison build-essential cmake cpputest default-libmysqlclient-dev fakeroot git libapache2-mod-php libboost-all-dev libfreetype6-dev libgif-dev libgl1-mesa-dev libjpeg62-turbo-dev liblua5.2-0 liblua5.2-dev liblzma-dev libogg-dev libopenal-dev libpng-dev libssh2-1-dev libssl-dev libtool libtool-bin libvorbis-dev libx11-dev libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxxf86vm-dev mercurial mysql-server php php-gd php-imagick php-mysql python3 python3-pip python3-bcrypt python3-venv rrdtool unzip wget zlib1g-dev - DEBIAN_FRONTEND=noninteractive apt-get install -y apache2 apache2-utils autoconf autogen automake bison build-essential cmake cpputest default-libmysqlclient-dev fakeroot git libapache2-mod-php libboost-all-dev libfreetype6-dev libgif-dev libgl1-mesa-dev libjpeg62-turbo-dev liblua5.2-0 liblua5.2-dev liblzma-dev libogg-dev libopenal-dev libpng-dev libssh2-1-dev libssl-dev libtool libtool-bin libvorbis-dev libx11-dev libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxxf86vm-dev mercurial mysql-server php php-gd php-imagick php-mysql python3 python3-pip python3-bcrypt python3-venv rrdtool unzip wget zlib1g-dev
# Apply patch # 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) - (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)
@ -563,8 +562,8 @@ Linux server_static_debug debian_amd64_strech build:
image: amd64/debian:9 image: amd64/debian:9
script: script:
# Prepare environment # Prepare environment
- apt-get update - DEBIAN_FRONTEND=noninteractive apt-get update
- apt-get dist-upgrade -y - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
- DEBIAN_FRONTEND=noninteractive apt-get install -y apache2 apache2-utils autoconf autogen automake bison build-essential cmake cpputest default-libmysqlclient-dev fakeroot git libapache2-mod-php libboost-all-dev libfreetype6-dev libgif-dev libgl1-mesa-dev libjpeg62-turbo-dev liblua5.2-0 liblua5.2-dev liblzma-dev libogg-dev libopenal-dev libpng-dev libssh2-1-dev libssl-dev libtool libtool-bin libvorbis-dev libx11-dev libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxxf86vm-dev mercurial mysql-server php php-gd php-imagick php-mysql python3 python3-pip python3-bcrypt python3-venv rrdtool unzip wget zlib1g-dev - DEBIAN_FRONTEND=noninteractive apt-get install -y apache2 apache2-utils autoconf autogen automake bison build-essential cmake cpputest default-libmysqlclient-dev fakeroot git libapache2-mod-php libboost-all-dev libfreetype6-dev libgif-dev libgl1-mesa-dev libjpeg62-turbo-dev liblua5.2-0 liblua5.2-dev liblzma-dev libogg-dev libopenal-dev libpng-dev libssh2-1-dev libssl-dev libtool libtool-bin libvorbis-dev libx11-dev libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxxf86vm-dev mercurial mysql-server php php-gd php-imagick php-mysql python3 python3-pip python3-bcrypt python3-venv rrdtool unzip wget zlib1g-dev
# Apply patch # 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) - (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)
@ -654,8 +653,8 @@ Linux client_static debian_i386_strech build:
image: i386/debian:9 image: i386/debian:9
script: script:
# Prepare environment # Prepare environment
- apt-get update - DEBIAN_FRONTEND=noninteractive apt-get update
- apt-get dist-upgrade -y - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
- apt-get install -y autoconf autogen automake bison build-essential cmake cpputest fakeroot libboost-all-dev libfreetype6-dev libgif-dev libgl1-mesa-dev libjpeg62-turbo-dev liblzma-dev libopenal-dev libpng-dev libssh2-1-dev libssl-dev libtool libtool-bin libx11-dev libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxxf86vm-dev mercurial rrdtool unzip wget zlib1g-dev patch - apt-get install -y autoconf autogen automake bison build-essential cmake cpputest fakeroot libboost-all-dev libfreetype6-dev libgif-dev libgl1-mesa-dev libjpeg62-turbo-dev liblzma-dev libopenal-dev libpng-dev libssh2-1-dev libssl-dev libtool libtool-bin libx11-dev libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxxf86vm-dev mercurial rrdtool unzip wget zlib1g-dev patch
- apt-get install -y liblua5.2-0 liblua5.2-dev - apt-get install -y liblua5.2-0 liblua5.2-dev
# Apply patch # Apply patch
@ -732,9 +731,9 @@ Linux client_static_debug debian_i386_strech build:
image: i386/debian:9 image: i386/debian:9
script: script:
# Prepare environment # Prepare environment
- apt-get update - DEBIAN_FRONTEND=noninteractive apt-get update
- apt-get dist-upgrade -y - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
- apt-get install -y autoconf autogen automake bison build-essential cmake cpputest fakeroot libboost-all-dev libfreetype6-dev libgif-dev libgl1-mesa-dev libjpeg62-turbo-dev liblzma-dev libopenal-dev libpng-dev libssh2-1-dev libssl-dev libtool libtool-bin libx11-dev libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxxf86vm-dev mercurial rrdtool unzip wget zlib1g-dev patch - DEBIAN_FRONTEND=noninteractive apt-get install -y autoconf autogen automake bison build-essential cmake cpputest fakeroot libboost-all-dev libfreetype6-dev libgif-dev libgl1-mesa-dev libjpeg62-turbo-dev liblzma-dev libopenal-dev libpng-dev libssh2-1-dev libssl-dev libtool libtool-bin libx11-dev libxml2-dev libxmu-dev libxrandr-dev libxrender-dev libxxf86vm-dev mercurial rrdtool unzip wget zlib1g-dev patch
- apt-get install -y liblua5.2-0 liblua5.2-dev - apt-get install -y liblua5.2-0 liblua5.2-dev
# Apply patch # 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) - (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)
@ -876,9 +875,9 @@ Linux client ubuntu_amd64_17_10 build:
image: amd64/ubuntu:17.10 image: amd64/ubuntu:17.10
script: script:
# Prepare environment # Prepare environment
- apt-get update - DEBIAN_FRONTEND=noninteractive apt-get update
- apt-get dist-upgrade -y - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
- apt-get install -y autoconf - DEBIAN_FRONTEND=noninteractive apt-get install -y autoconf
autogen autogen
automake automake
bison bison
@ -1033,9 +1032,9 @@ Windows client build:
script: script:
# Prepare environment # Prepare environment
- dpkg --add-architecture i386 - dpkg --add-architecture i386
- apt-get update - DEBIAN_FRONTEND=noninteractive apt-get update
- apt-get dist-upgrade -y - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
- apt-get install -y - DEBIAN_FRONTEND=noninteractive apt-get install -y
p7zip-full p7zip-full
binfmt-support binfmt-support
libc6-i386 libc6-i386
@ -1098,7 +1097,7 @@ Linux client test:
- mac-ci-build - mac-ci-build
tags: tags:
- Docker - Docker
image: ubuntu:14.04 image: ubuntu:18.04
script: script:
# Test de l'installation initiale # Test de l'installation initiale
- ./khanat-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-Linux-x86_64.run - ./khanat-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-Linux-x86_64.run
@ -1128,7 +1127,7 @@ Linux client test:
- ryzomcore - ryzomcore
tags: tags:
- Docker - Docker
image: ubuntu:14.04 image: ubuntu:18.04
script: script:
- echo "pas encore de deployment" - echo "pas encore de deployment"
dependencies: dependencies:
@ -1148,7 +1147,7 @@ Linux client test:
- tags - tags
tags: tags:
- Docker - Docker
image: ubuntu:14.04 image: ubuntu:18.04
script: script:
- echo "pas encore de tag" - echo "pas encore de tag"
dependencies: dependencies: