diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2017-06-04 23:07:45 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2017-06-05 00:06:01 +0200 |
| commit | bfacfc20624a46f05193e7e036a58ec906450494 (patch) | |
| tree | 71c508d6a87ec31294e0509664fb8ce7ddac9fe9 /.gitlab-ci.yml | |
| parent | 599e13e95e81aadb959c9f3715aec9b425ede084 (diff) | |
| download | minetest-bfacfc20624a46f05193e7e036a58ec906450494.tar.gz minetest-bfacfc20624a46f05193e7e036a58ec906450494.tar.bz2 minetest-bfacfc20624a46f05193e7e036a58ec906450494.zip | |
Gitlab CI: Fix Ubuntu 14.04/Debian 8 build by using GCC 6 toolchain
+ indent fix
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 52 |
1 files changed, 31 insertions, 21 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef3b371a4..ad1b9a8c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,8 +64,13 @@ build:debian-8: <<: *build_definition image: debian:8 before_script: + - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main" > /etc/apt/sources.list.d/uptodate-toolchain.list + - apt-key adv --keyserver keyserver.ubuntu.com --recv BA9EF27F - apt-get update -y - - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev + - apt-get -y install build-essential gcc-6 g++-6 libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev + variables: + CC: gcc-6 + CXX: g++-6 package:debian-8: image: debian:8 @@ -115,11 +120,16 @@ deploy:debian-9: # Trusty build:ubuntu-14.04: - <<: *build_definition - image: ubuntu:trusty - before_script: - - apt-get update -y - - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev + <<: *build_definition + image: ubuntu:trusty + before_script: + - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main" > /etc/apt/sources.list.d/uptodate-toolchain.list + - apt-key adv --keyserver keyserver.ubuntu.com --recv BA9EF27F + - apt-get update -y + - apt-get -y install build-essential gcc-6 g++-6 libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev + variables: + CC: gcc-6 + CXX: g++-6 package:ubuntu-14.04: image: ubuntu:trusty @@ -140,11 +150,11 @@ deploy:ubuntu-14.04: # Xenial build:ubuntu-16.04: - <<: *build_definition - image: ubuntu:xenial - before_script: - - apt-get update -y - - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev + <<: *build_definition + image: ubuntu:xenial + before_script: + - apt-get update -y + - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev package:ubuntu-16.04: image: ubuntu:xenial @@ -165,11 +175,11 @@ deploy:ubuntu-16.04: # Yakkety build:ubuntu-16.10: - <<: *build_definition - image: ubuntu:yakkety - before_script: - - apt-get update -y - - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev + <<: *build_definition + image: ubuntu:yakkety + before_script: + - apt-get update -y + - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev package:ubuntu-16.10: image: ubuntu:yakkety @@ -190,11 +200,11 @@ deploy:ubuntu-16.10: # Zesty build:ubuntu-17.04: - <<: *build_definition - image: ubuntu:zesty - before_script: - - apt-get update -y - - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev + <<: *build_definition + image: ubuntu:zesty + before_script: + - apt-get update -y + - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev package:ubuntu-17.04: image: ubuntu:zesty |