From c06f3c155739cbb6562771cb22d8dadf0ff08952 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sun, 15 Mar 2020 19:58:44 +0100 Subject: [PATCH 1/3] GIT_SILENT Upgrade release service version to 20.03.80. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b01416b02..1e3319d39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) # KDE Application Version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "20") set (RELEASE_SERVICE_VERSION_MINOR "03") -set (RELEASE_SERVICE_VERSION_MICRO "70") +set (RELEASE_SERVICE_VERSION_MICRO "80") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(okular VERSION 1.9.${RELEASE_SERVICE_VERSION_MICRO}) From f431ef6dccd31d7e4e382b43c3fefca01657657c Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 26 Mar 2020 22:26:56 +0100 Subject: [PATCH 2/3] CI: tell debian derivatives not to ask us question in apt time --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d92a9833..d5580acc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +variables: + DEBIAN_FRONTEND: "noninteractive" + include: - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml From e2335e965a450e083272d955ad1376612155c0fe Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 26 Mar 2020 22:27:21 +0100 Subject: [PATCH 3/3] CI: Use debian testing while unstable is broken --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5580acc3..492b54b70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ build_ubuntu_20_04: build_clazy_clang_tidy: stage: build - image: debian:unstable + image: debian:testing only: - merge_requests before_script: