From: Kevin McCarthy <kevin@8t8.us>
Date: Fri, 30 Nov 2018 23:12:47 +0000 (-0800)
Subject: Convert to use gitlab registry image ubuntu:18.04.
X-Git-Tag: mutt-1-12-rel~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f34cb1fb8468f74894818343dd8d95da5c0c640d;p=mutt

Convert to use gitlab registry image ubuntu:18.04.

The gitlab registry image is built using the Dockerfile in
muttmua/docker-images/tree/master/ubuntu/18.04/

Turn off the scan-build-5.0.  I never look at those reports and they
run very slowly.

Also, for now just compile for gnutls, to speed up the check further.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a108c86c..eb19e320 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,26 +1,14 @@
-image: mutt/ubuntu:16.04
+image: registry.gitlab.com/muttmua/mutt/ubuntu:18.04
 
 stages:
   - build
   - deploy
 
-openssl:
+build:
   stage: build
   script:
-    - scan-build-5.0 ./prepare --disable-dependency-tracking --enable-gpgme --enable-sidebar --enable-compressed --enable-pop --enable-imap --enable-smtp --enable-debug --enable-hcache --with-ssl
-    - scan-build-5.0 -o scan-build-openssl make -j
-  artifacts:
-    paths:
-      - scan-build-openssl
-
-gnutls:
-  stage: build
-  script:
-    - scan-build-5.0 ./prepare --disable-dependency-tracking --enable-gpgme --enable-sidebar --enable-compressed --enable-pop --enable-imap --enable-smtp --enable-debug --enable-hcache --with-gnutls
-    - scan-build-5.0 -o scan-build-gnutls make -j
-  artifacts:
-    paths:
-      - scan-build-gnutls
+    - ./prepare --disable-dependency-tracking --enable-gpgme --enable-sidebar --enable-compressed --enable-pop --enable-imap --enable-smtp --enable-debug --enable-hcache --with-gnutls
+    - make -j
 
 pages:
   stage: deploy