From d1f125bca2a075b80270f5121d384771bf4dca42 Mon Sep 17 00:00:00 2001
From: John Ellson <john.ellson@gmail.com>
Date: Tue, 13 Nov 2018 09:48:12 -0500
Subject: [PATCH] trying ubuntu runners

---
 .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++-------
 debian/rules   |  5 ++---
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3371caa23..b2c8a7dfe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ portable-source:
     only:
         - master
 
-.build_template: &build_definition
+.build_template: &rpm_build_definition
     stage: build
     script:
         - rm -rf /home/gitlab-runner/rpmbuild
@@ -34,32 +34,58 @@ portable-source:
     only:
         - master
 
+.build_template: &deb_build_definition
+    stage: build
+    script:
+        - VERSION=$( cat VERSION )
+        - zcat graphviz-@VERSION@.tar.gz | tar xf -
+        - (cd graphviz-@VERSION@; fakeroot make -f debian/rules binary)
+        - ln -s graphviz-@VERSION@ packages
+    artifacts:
+        when: on_success
+        expire_in: 1 week
+        paths:
+            - packages/*.deb
+            - packages/*.ddeb
+    only:
+        - master
+
 centos6-build:
-    <<: *build_definition
+    <<: *rpm_build_definition
     tags:
         - graphviz,centos6
 
 centos7-build:
-    <<: *build_definition
+    <<: *rpm_build_definition
     tags:
         - graphviz,centos7
 
 fedora27-build:
-    <<: *build_definition
+    <<: *rpm_build_definition
     tags:
         - graphviz,fedora27
 
 fedora28-build:
-    <<: *build_definition
+    <<: *rpm_build_definition
     tags:
         - graphviz,fedora28
 
 fedora29-build:
-    <<: *build_definition
+    <<: *rpm_build_definition
     tags:
         - graphviz,fedora29
 
 fedora30-build:
-    <<: *build_definition
+    <<: *rpm_build_definition
     tags:
         - graphviz,fedora30
+
+ubuntu18-04-build:
+    <<: *deb_build_definition
+    tags:
+        - graphviz,ubuntu18-04
+
+ubuntu18-10-build:
+    <<: *deb_build_definition
+    tags:
+        - graphviz,ubuntu18-10
diff --git a/debian/rules b/debian/rules
index d896aa3d0..82701b744 100755
--- a/debian/rules
+++ b/debian/rules
@@ -195,15 +195,14 @@ install: build
 	rm -rf $(OCAML_PACKAGE)/usr/lib/graphviz
 
 	# Some additional work for libgv-python
-	# Note the sed call because of python{24,25} instead of python{2.4,2.5}
 	# Note gv.py isn't really duplicated, it's just installed in a location
 	# where python-support will find it. Both being identical, python-support
 	# will just do the right thing.
 	for i in $(PYTHON_VERSIONS); do \
 		install -d $(PYTHON_PACKAGE)/usr/lib/$$i/site-packages ; \
-		cp $(PYTHON_PACKAGE)/usr/lib/graphviz/python/gv.py \
+		cp $(PYTHON_PACKAGE)/usr/lib/graphviz/python*/gv.py \
 			$(PYTHON_PACKAGE)/usr/lib/$$i/site-packages ; \
-		mv $(PYTHON_PACKAGE)/usr/lib/graphviz/$$(echo $$i|sed -e 's/\.//')/*.so \
+		mv $(PYTHON_PACKAGE)/usr/lib/graphviz/python*/*.so \
 			$(PYTHON_PACKAGE)/usr/lib/$$i/site-packages ; \
 	done
 	rm -rf $(PYTHON_PACKAGE)/usr/lib/graphviz
-- 
2.40.0