From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Mon, 30 Mar 2020 09:54:25 +0000 (+0200)
Subject: Build Ubuntu 18.04 & 19.04 in Docker containers on GitLab runners
X-Git-Tag: stable_release_2.42.4~5^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1a0b605212010d0cba51373c9bc5ffc265161dc;p=graphviz

Build Ubuntu 18.04 & 19.04 in Docker containers on GitLab runners

Also changed to run for all branches.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e007f447e..ebc326758 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,8 +67,6 @@ portable-source:
         paths:
             - Packages/*/*/*/*/*/*deb
             - Packages/*/*/*/*/*.gz
-    only:
-        - master
 
 centos6-build:
     <<: *rpm_build_definition
@@ -123,17 +121,21 @@ fedora33-build:
 ubuntu18-04-build:
     <<: *deb_build_definition
     tags:
-        - graphviz,ubuntu18-04
+        - linux
+    image: "graphviz/graphviz:ubuntu-18.04"
 
 ubuntu18-10-build:
     <<: *deb_build_definition
     tags:
         - graphviz,ubuntu18-10
+    only:
+        - master
 
 ubuntu19-04-build:
     <<: *deb_build_definition
     tags:
-        - graphviz,ubuntu19-04
+        - linux
+    image: "graphviz/graphviz:ubuntu-19.04"
 
 
 deployment: