From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Sat, 11 Apr 2020 09:13:13 +0000 (+0200)
Subject: Move build code from .gitlab-ci.yml to new ci/build.sh script
X-Git-Tag: 2.44.1~79^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7fffc02ae8a347af1e389ccd86d99adc53d0a3b8;p=graphviz

Move build code from .gitlab-ci.yml to new ci/build.sh script
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9237f5ab7..18c5997ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,21 +25,7 @@ portable-source:
 .build_template: &rpm_build_definition
     stage: build
     script:
-        - rm -rf ${HOME}/rpmbuild
-        - GV_VERSION=$( cat VERSION )
-        - COLLECTION=$( cat COLLECTION )
-        - rpmbuild -ta graphviz-${GV_VERSION}.tar.gz
-        - ID=$( cat /etc/redhat-release | cut -d' ' -f1 | tr 'A-Z' 'a-z' )
-        - VERSION_ID=$( cat /etc/redhat-release | cut -d' ' -f3  | cut -d'.' -f1 )
-        - if test -f /etc/os-release; then . /etc/os-release; fi
-        - DIR=Packages/${COLLECTION}/${ID}/${VERSION_ID}
-        - ARCH=$( uname -m )
-        - mkdir -p ${DIR}/os/${ARCH}
-        - mkdir -p ${DIR}/debug/${ARCH}
-        - mkdir -p ${DIR}/source
-        - mv ${HOME}/rpmbuild/SRPMS/*.src.rpm ${DIR}/source/
-        - mv ${HOME}/rpmbuild/RPMS/*/*debuginfo*rpm ${DIR}/debug/${ARCH}/
-        - mv ${HOME}/rpmbuild/RPMS/*/*.rpm ${DIR}/os/${ARCH}/
+        - ci/build.sh
     artifacts:
         when: on_success
         expire_in: 1 week
@@ -52,19 +38,7 @@ portable-source:
 .build_template: &deb_build_definition
     stage: build
     script:
-        - cat /etc/os-release
-        - GV_VERSION=$( cat VERSION )
-        - COLLECTION=$( cat COLLECTION )
-        - zcat graphviz-${GV_VERSION}.tar.gz | tar xf -
-        - (cd graphviz-${GV_VERSION}; fakeroot make -f debian/rules binary)
-        - . /etc/os-release
-        - DIR=Packages/${COLLECTION}/${ID}/${VERSION_ID}
-        - ARCH=$( uname -m )
-        - mkdir -p ${DIR}/os/${ARCH}
-        - mkdir -p ${DIR}/debug/${ARCH}
-        - mkdir -p ${DIR}/source
-        - mv *.deb ${DIR}/os/${ARCH}/
-        - mv *.ddeb ${DIR}/debug/${ARCH}/
+        - ci/build.sh
     artifacts:
         when: on_success
         expire_in: 1 week
diff --git a/ci/build.sh b/ci/build.sh
new file mode 100755
index 000000000..99dd3e618
--- /dev/null
+++ b/ci/build.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+set -x
+
+if test -f /etc/os-release; then
+    cat /etc/os-release
+    . /etc/os-release
+else
+    cat /etc/redhat-release
+    ID=$( cat /etc/redhat-release | cut -d' ' -f1 | tr 'A-Z' 'a-z' )
+    VERSION_ID=$( cat /etc/redhat-release | cut -d' ' -f3  | cut -d'.' -f1 )
+fi
+GV_VERSION=$( cat VERSION )
+COLLECTION=$( cat COLLECTION )
+if [ "${ID_LIKE}" = "debian" ]; then
+    tar xfz graphviz-${GV_VERSION}.tar.gz
+    (cd graphviz-${GV_VERSION}; fakeroot make -f debian/rules binary)
+else
+    rm -rf ${HOME}/rpmbuild
+    rpmbuild -ta graphviz-${GV_VERSION}.tar.gz
+fi
+DIR=Packages/${COLLECTION}/${ID}/${VERSION_ID}
+ARCH=$( uname -m )
+mkdir -p ${DIR}/os/${ARCH}
+mkdir -p ${DIR}/debug/${ARCH}
+mkdir -p ${DIR}/source
+if [ "${ID_LIKE}" = "debian" ]; then
+    mv *.deb ${DIR}/os/${ARCH}/
+    mv *.ddeb ${DIR}/debug/${ARCH}/
+else
+    mv ${HOME}/rpmbuild/SRPMS/*.src.rpm ${DIR}/source/
+    mv ${HOME}/rpmbuild/RPMS/*/*debuginfo*rpm ${DIR}/debug/${ARCH}/
+    mv ${HOME}/rpmbuild/RPMS/*/*.rpm ${DIR}/os/${ARCH}/
+fi