WIP deploy - try a dumber approach

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe727a837d70a4610e95f192a30fe80c538a9491..ef660a87dff19cf87ffb57345263735d67eeb9e1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,9 +26,8 @@ portable-source:
         - rm -rf /home/gitlab-runner/rpmbuild
         - GV_VERSION=$( cat VERSION )
         - rpmbuild -ta graphviz-${GV_VERSION}.tar.gz
-        - . /etc/os-release
         - ARCH=$( uname -m )
-        - DIR=Packages/${ID}/${VERSION_ID}
+        - DIR=Packages/${DISTRO_NAME}/${DISTRO_VERSION}
         - mkdir -p ${DIR}/os/${ARCH}
         - mkdir -p ${DIR}/debug/${ARCH}
         - mkdir -p ${DIR}/source
@@ -50,15 +49,14 @@ portable-source:
         - GV_VERSION=$( cat VERSION )
         - zcat graphviz-${GV_VERSION}.tar.gz | tar xf -
         - (cd graphviz-${GV_VERSION}; fakeroot make -f debian/rules binary)
-        - . /etc/os-release
         - ARCH=$( uname -m )
-        - DIR=Packages/${ID}/${VERSION_ID}
+        - DIR=Packages/${DISTRO_NAME}/${DISTRO_VERSION}
         - mkdir -p ${DIR}/os/${ARCH}
         - mkdir -p ${DIR}/debug/${ARCH}
         - mkdir -p ${DIR}/source
         - cp *.deb ${DIR}/os/${ARCH}/
         - cp *.ddeb ${DIR}/debug/${ARCH}/
-        - cp graphviz-${VERSION}.tar.gz ${DIR}/source/
+        - cp graphviz-${GV_VERSION}.tar.gz ${DIR}/source/
     artifacts:
         when: on_success
         expire_in: 1 week
@@ -69,51 +67,71 @@ portable-source:
         - master
 
 centos6-build:
+    export DISTRO_NAME=centos
+    export DISTRO_VERSION=6
     <<: *rpm_build_definition
     tags:
         - graphviz,centos6
 
 centos7-build:
+    export DISTRO_NAME=centos
+    export DISTRO_VERSION=7
     <<: *rpm_build_definition
     tags:
         - graphviz,centos7
 
 fedora27-build:
+    export DISTRO_NAME=fedora
+    export DISTRO_VERSION=27
     <<: *rpm_build_definition
     tags:
         - graphviz,fedora27
 
 fedora28-build:
+    export DISTRO_NAME=fedora
+    export DISTRO_VERSION=28
     <<: *rpm_build_definition
     tags:
         - graphviz,fedora28
 
 fedora29-build:
+    export DISTRO_NAME=fedora
+    export DISTRO_VERSION=29
     <<: *rpm_build_definition
     tags:
         - graphviz,fedora29
 
 fedora30-build:
+    export DISTRO_NAME=fedora
+    export DISTRO_VERSION=30
     <<: *rpm_build_definition
     tags:
         - graphviz,fedora30
 
 fedora31-build:
+    export DISTRO_NAME=fedora
+    export DISTRO_VERSION=31
     <<: *rpm_build_definition
     tags:
         - graphviz,fedora31
 
 ubuntu18-04-build:
+    export DISTRO_NAME=ubuntu
+    export DISTRO_VERSION=18.04
     <<: *deb_build_definition
     tags:
         - graphviz,ubuntu18-04
 
 ubuntu18-10-build:
+    export DISTRO_NAME=ubuntu
+    export DISTRO_VERSION=18.10
     <<: *deb_build_definition
     tags:
         - graphviz,ubuntu18-10
 
 ubuntu19-04-build:
+    export DISTRO_NAME=ubuntu
+    export DISTRO_VERSION=19.04
     <<: *deb_build_definition
     tags:
         - graphviz,ubuntu19-04