From 1056e9d1d8a1e6a15ad96389b461e5e126557de1 Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Tue, 1 May 2018 11:28:33 +0200
Subject: CI: build for the latest version of OSs.

Also add Ubuntu to the CI pipeline, I don't want to be biased to one
distro or the other.
---
 .gitlab-ci.yml | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52f4e8d..f1d00ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ stages:
   - build-flatpak
   - build-os
 
+# We always use flatpak-builder to check if everything still works.
 flatpak:master:
   image: registry.gitlab.com/alatiera/gnome-nightly-oci/gnome-master:latest
   stage: build-flatpak
@@ -32,26 +33,26 @@ flatpak:master:
     paths:
       - .flatpak-builder/cache
 
-fedora:stable:
-  image: fedora:27
+
+# We also check (less often) if we're still building on some popular distros
+fedora:rawhide:
+  image: fedora:rawhide
+  stage: build-os
+  before_script:
+    - dnf update -y && dnf install -y 'dnf-command(builddep)' redhat-rpm-config
+    - dnf builddep -y gnome-contacts
+  <<: *distro_build
+  only:
+    - schedules
+    - web
+    - tags
+
+ubuntu:devel:
+  image: ubuntu:devel
   stage: build-os
   before_script:
-    - dnf update -y
-    - >
-      dnf install -y \
-        gcc \
-        meson \
-        vala \
-        gettext \
-        glib2-devel \
-        gtk3-devel \
-        libgee-devel \
-        folks-devel \
-        evolution-data-server-devel \
-        gnome-desktop3-devel \
-        cheese-libs-devel \
-        gnome-online-accounts-devel \
-        telepathy-glib-devel
+    - apt update -y
+    - apt build-dep -y gnome-contacts
   <<: *distro_build
   only:
     - schedules
-- 
cgit v1.2.1