blob: 37891277d0de8f43804d62d121bd8fe2ee3e5508 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
https://gitlab.com/accounts-sso/signond/-/merge_requests/36
From 10f791a62e229bcb5e3975c752bcd5519758240f Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Mon, 1 Aug 2022 19:37:41 +0200
Subject: [PATCH 07/11] Add Qt6 CI
---
.gitlab-ci.yml | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 40 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 409f6e2..c784909 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,14 @@
-image: ubuntu:bionic
-
cache:
key: apt-cache
paths:
- apt-cache/
-before_script:
- - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
- - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qt5-qmake qt5-default qtbase5-dev qtchooser pkg-config libqt5sql5-sqlite doxygen libdbus-1-dev
- - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev
- - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y lcov gcovr
-
build_amd64:
stage: build
+ image: ubuntu:bionic
+ before_script:
+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qt5-qmake qt5-default qtbase5-dev qtchooser pkg-config libqt5sql5-sqlite doxygen libdbus-1-dev
script:
- mkdir build
- cd build
@@ -24,6 +20,10 @@ build_amd64:
test_amd64:
stage: test
+ image: ubuntu:bionic
+ before_script:
+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev lcov gcovr make qt5-qmake qt5-default qtbase5-dev qtchooser pkg-config libqt5sql5-sqlite doxygen libdbus-1-dev
script:
- find build | xargs touch # Avoid rebuilding
- cd build
@@ -34,6 +34,38 @@ test_amd64:
paths:
- ./
+build_amd64_qt6:
+ stage: build
+ image: ubuntu:jammy
+ before_script:
+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make
+ script:
+ - mkdir build
+ - cd build
+ - qmake6 CONFIG+=debug CONFIG+=coverage CONFIG+=enable-backup CONFIG+=enable-p2p ..
+ - make -j 4
+ artifacts:
+ paths:
+ - build/
+
+test_amd64_qt6:
+ stage: test
+ image: ubuntu:jammy
+ before_script:
+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+ - export DEBIAN_FRONTEND=noninteractive
+ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev lcov gcovr make qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make
+ script:
+ - find build | xargs touch # Avoid rebuilding
+ - cd build
+ - make coverage-html
+ dependencies:
+ - build_amd64_qt6
+ artifacts:
+ paths:
+ - ./
+
pages:
stage: deploy
script:
--
2.43.0
|
GitWeb