trying ubuntu runners

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3371caa234ba72eb398038702d1bcb678232bf5c..b2c8a7dfe2d8dd40f93c8886e2b01a513f3c388a 100644 (file)
--- 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 d896aa3d08ca29d19ddf49906042d108a9b57ce9..82701b744d3055b8ccf674ba965406ce3ddbde84 100755 (executable)
--- 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