From d3d16fcc17c21702a98303c6807ad949eef58ee3 Mon Sep 17 00:00:00 2001
From: Tobias Junghans <tobydox@veyon.io>
Date: Mon, 10 May 2021 08:53:58 +0200
Subject: [PATCH] CI: switch to Ubuntu 20.10 to have Qt >= 5.14
KDE Frameworks requires Qt 5.14 already so we should adopt that. This
will also save quite a few #ifdefs when migrating to Qt 6.
---
.gitlab-ci.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 501ea0f6..b5507d65 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,12 @@
-build_ubuntu_18_04:
+build_ubuntu_20_10:
stage: build
- image: ubuntu:bionic
+ image: ubuntu:groovy
before_script:
- sed -i -e 's/# deb-src/deb-src/g' /etc/apt/sources.list
- - apt-get update
- - apt-get install --yes eatmydata
- - eatmydata apt-get build-dep --yes --no-install-recommends qca-qt5
- - eatmydata apt-get install --yes --no-install-recommends ninja-build libbotan-2-dev libnss3-dev libgcrypt20-dev libpkcs11-helper1-dev gnupg
+ - apt update
+ - apt install --yes eatmydata
+ - eatmydata apt build-dep --yes --no-install-recommends qca2
+ - eatmydata apt install --yes --no-install-recommends ninja-build libbotan-2-dev libnss3-dev libgcrypt20-dev libpkcs11-helper1-dev gnupg
script:
- mkdir -p build && cd build
- cmake -G Ninja ..