CI: re-added gnupg
parent
b50f38decf
commit
7d1d5e52d8
|
@ -47,9 +47,11 @@ pipeline:
|
|||
- CXXFLAGS=-pipe -O2
|
||||
commands:
|
||||
- rm /etc/apt/apt.conf.d/docker-clean
|
||||
- apt-get update -q
|
||||
- echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
|
||||
- echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/backports.list
|
||||
- echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list
|
||||
- apt-get install -qy gnupg
|
||||
- gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 0x60c317803a41ba51845e371a1e9377a2ba9ef27f
|
||||
- gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add -
|
||||
- apt-get update -q
|
||||
|
@ -74,9 +76,11 @@ pipeline:
|
|||
- CXXFLAGS=-pipe -O2
|
||||
commands:
|
||||
- rm /etc/apt/apt.conf.d/docker-clean
|
||||
- apt-get update -q
|
||||
- echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release
|
||||
- echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/backports.list
|
||||
- echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list
|
||||
- apt-get install -qy gnupg
|
||||
- gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 0x60c317803a41ba51845e371a1e9377a2ba9ef27f
|
||||
- gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add -
|
||||
- apt-get update -q
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
cmake_minimum_required (VERSION 3.6)
|
||||
project (whyblocked
|
||||
VERSION 0.12.0
|
||||
VERSION 0.12.1
|
||||
LANGUAGES CXX
|
||||
)
|
||||
|
||||
|
@ -10,7 +10,7 @@ pkg_check_modules(LIBXDG_BASEDIR REQUIRED libxdg-basedir)
|
|||
# sqlite3 is not a direct dependency, but vsqlite++ has no cmake- or pkg-config
|
||||
# module. Since it installs in the same directories as sqlite3, I am adding the
|
||||
# module here to add the include- and link directories below. It is not REQUIRED
|
||||
# because the sqlite3 in Debian jessie doesn't come with an pkg-config module.
|
||||
# because the sqlite3 in Debian jessie doesn't come with a pkg-config module.
|
||||
pkg_check_modules(SQLITE3 sqlite3)
|
||||
find_package(Qt5Core CONFIG REQUIRED)
|
||||
if(NOT WITHOUT_GUI)
|
||||
|
|
Loading…
Reference in New Issue