diff options
| author | Albert Astals Cid <aacid@kde.org> | 2019-03-22 00:21:12 +0100 |
|---|---|---|
| committer | Albert Astals Cid <tsdgeos@yahoo.es> | 2019-03-21 23:46:59 +0000 |
| commit | c317087a9e5db4f6441b4e399837d5b9afbe46a0 (patch) | |
| tree | 63d1d9c6c0b0c40b2e92abd820fe877ce3a7e6ef /.gitlab-ci.yml | |
| parent | 9068f1c0d2f643471a7e159f4a03dca4a20518f2 (diff) | |
Stop requiring gcc 4.9
We now just support whatever Ubuntu 16.04 has as minimum (gcc 5.4.0)
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b2bc767..575e6628 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,21 +44,12 @@ build_clang_libcpp: - ninja - ctest --output-on-failure -build_gcc_49: +build_ubuntu_16_04: stage: build - image: ubuntu:trusty + image: ubuntu:xenial before_script: - apt-get update - - apt-get install --yes software-properties-common - - add-apt-repository --yes ppa:ubuntu-toolchain-r/test - - add-apt-repository --yes ppa:george-edison55/cmake-3.x - - add-apt-repository --yes ppa:ricotz/testing - - add-apt-repository --yes ppa:aacid/openjp2trusty - - apt-get update - - apt-get install --yes build-essential cmake ninja-build gcc-4.9 g++-4.9 libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev - - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 20 - - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 20 - - update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.9 20 + - apt-get install --yes --no-install-recommends build-essential cmake ninja-build libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev ca-certificates script: - mkdir -p build && cd build - cmake -G Ninja .. |