From b65be7aa7961d90c886d0286a958445028353308 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 25 Oct 2019 09:50:48 +1000
Subject: [PATCH] CI: add a Centos 8 container build

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 .gitlab-ci.yml | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e09c0ea..16aa4a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,7 @@ variables:
   # distribution                                                                #
   ###############################################################################
   FEDORA_RPMS: 'git gcc gcc-c++ automake autoconf libtool make pkgconfig  python3 check-devel valgrind binutils doxygen xz'
-  CENTOS_RPMS: $FEDORA_RPMS
+  CENTOS_RPMS: 'git gcc gcc-c++ automake autoconf libtool make pkgconfig  python3 check-devel valgrind binutils xz'
   UBUNTU_DEBS: 'git gcc g++     automake autoconf libtool make pkg-config python3 check       valgrind binutils doxygen xz-utils'
   DEBIAN_DEBS: $UBUNTU_DEBS
   ARCH_PKGS:   'git gcc         automake autoconf libtool make pkgconfig  python3 check       valgrind binutils doxygen'
@@ -193,6 +193,17 @@ centos:7@container-prep:
     TAG: $CENTOS_TAG
   <<: *pull_upstream_or_rebuild
 
+centos:8@container-prep:
+  extends: .centos@container-build
+  stage: container_prep
+  variables:
+    GIT_STRATEGY: none
+    CENTOS_VERSION: 8
+    DISTRIB_FLAVOR: centos
+    DISTRIB_VERSION: $CENTOS_VERSION
+    TAG: $CENTOS_TAG
+  <<: *pull_upstream_or_rebuild
+
 arch:rolling@container-prep:
   extends: .arch@container-build
   stage: container_prep
@@ -344,6 +355,13 @@ centos:7@container-clean:
     CENTOS_VERSION: 7
     CURRENT_CONTAINER_IMAGE: $CENTOS_CONTAINER_IMAGE
 
+centos:8@container-clean:
+  extends: .container-clean
+  variables:
+    GIT_STRATEGY: none
+    CENTOS_VERSION: 8
+    CURRENT_CONTAINER_IMAGE: $CENTOS_CONTAINER_IMAGE
+
 arch:rolling@container-clean:
   extends: .container-clean
   variables:
@@ -400,6 +418,13 @@ centos:7@default-build:
     CENTOS_VERSION: 7
   needs: ['centos:7@container-prep']
 
+centos:8@default-build:
+  extends: .centos-build@template
+  variables:
+    CENTOS_VERSION: 8
+    MAKE_ARGS: ''  # disable distcheck, requires doxygen
+  needs: ['centos:8@container-prep']
+
 .ubuntu@template:
   stage: distro
   extends: .build@template
-- 
2.34.1