diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2021-11-17 22:23:50 +0100 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2021-11-18 00:12:38 +0100 |
| commit | eb3ff097d5ede1a7e30f42025555ce1dd2e1e287 (patch) | |
| tree | 30d0cd1e7f9f69c49a5215ee10aac61ce1ca0f1a /.gitlab-ci.yml | |
| parent | 9c1c3eb10d93741a7b10d7a3b87ad63555028ca5 (diff) | |
Update bundled deps
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a917b03..031e140c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,32 +6,24 @@ variables: build-gcc7: stage: build - image: ubuntu:16.04 + image: ubuntu:20.04 tags: [docker] variables: - CXX: g++-7 - CC: gcc-7 QT_PKG: 515 TRAVIS_OS_NAME: linux before_script: - apt-get update - apt-get install -y software-properties-common - add-apt-repository ppa:ubuntu-toolchain-r/test -y - - add-apt-repository ppa:beineri/opt-qt-5.15.2-xenial -y - - apt-get update && apt-get -y install --no-install-recommends g++-7 build-essential ninja-build qt${QT_PKG}{base,declarative,tools,multimedia,script,quickcontrols2,svg} liblmdb-dev libgl1-mesa-dev libssl-dev git ccache + - add-apt-repository ppa:beineri/opt-qt-5.15.2-focal -y + - apt-get update && apt-get -y install --no-install-recommends build-essential ninja-build qt${QT_PKG}{base,declarative,tools,multimedia,script,quickcontrols2,svg} liblmdb-dev libgl1-mesa-dev libssl-dev git ccache pkg-config libsecret-1-dev cmake # need recommended deps for wget - apt-get -y install wget - - wget https://github.com/Kitware/CMake/releases/download/v3.19.0/cmake-3.19.0-Linux-x86_64.sh && sh cmake-3.19.0-Linux-x86_64.sh --skip-license --prefix=/usr/local - /usr/sbin/update-ccache-symlinks - - update-alternatives --install /usr/bin/gcc gcc "/usr/bin/${CC}" 10 - - update-alternatives --install /usr/bin/g++ g++ "/usr/bin/${CXX}" 10 - - update-alternatives --set gcc "/usr/bin/${CC}" - - update-alternatives --set g++ "/usr/bin/${CXX}" - rm -rf ../.hunter && mv .hunter ../.hunter || true script: - export PATH="/usr/lib/ccache:${PATH}" - export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) - - export PATH="/usr/local/bin/:${PATH}" - . "/opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh" || true - cmake -GNinja -H. -Bbuild -DCMAKE_INSTALL_PREFIX=.deps/usr |