From 111c7a20df0b81e6f867d9f27bb3b87cf1dcc5ac Mon Sep 17 00:00:00 2001
From: Matthew Chambers <nr0q@gridtracker.org>
Date: Wed, 10 Mar 2021 11:27:19 +0000
Subject: [PATCH] Update .gitlab-ci.yml with Abby's refinements and include
 NR0Qs updates

---
 .gitlab-ci.yml | 62 +++++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02451222..5e33c901 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,33 +72,43 @@ packaging:
         - package.json
         - package.nw/package.json
   script:
-    - mkdir -p $APT_CACHE_DIR $NPM_CONFIG_CACHE
-    - mkdir -p build/debian build/rpm
-    - dpkg --add-architecture i386
-    - apt-get -qq update
-    - apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y npm wine wine32
-    - apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y build-essential devscripts
-    - apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y rpm
-    - apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" build-dep .
+    - |
+      mkdir -p $APT_CACHE_DIR $NPM_CONFIG_CACHE
+      mkdir -p artifacts/{debian,rpm}
+      dpkg --add-architecture i386
+    - |
+      echo -e "\e[0Ksection_start:`date +%s`:apt_get[collapsed=true]\r\e[0KGetting Build Dependencies"
+      apt-get -qq update
+      apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y npm wine wine32
+      apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y build-essential devscripts
+      apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y rpm
+      apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" build-dep .
+      echo -e "\e[0Ksection_end:`date +%s`:apt_get\r\e[0K"
     - test `node version.js` = `dpkg-parsechangelog -S version` || (echo "package.nw/package.json and debian/changelog version mismatch"; exit 1)
-    - echo "Building native packages"
-    - npm install --prefer-offline
-    - npm run dist
-    - for dir in dist/*-linux-* ; do if [ -d $dir ] ; then tar -C dist -czf ${dir}.tar.gz `basename $dir` ; fi ; done
-    - cd dist; pwd; ls
-    - mkdir -p $HOME/rpmbuild/SOURCES; cp *.tar.gz $HOME/rpmbuild/SOURCES
-    - (mv *.exe *-mac-x64.zip *.tar.gz ../build)
-    - cd ..; ls
-    - echo "Building Debian packages"
-    - dpkg-buildpackage -uc -us
-    - mkdir -p build/debian
-    - mv ../*.{deb,dsc,buildinfo,tar.xz,changes} build/debian/
-    - mkdir -p $HOME/rpmbuild/RPMS
-    - echo "Building RPM packages"
-    - setarch i386 rpmbuild -D "version `node ./version.js`" --build-in-place -bb gridtracker.i386.spec
-    - setarch x86_64 rpmbuild -D "version `node ./version.js`" --build-in-place -bb gridtracker.x86_64.spec
-    - mv $HOME/rpmbuild/RPMS/i386/gridtracker-*.i386.rpm build/rpm
-    - mv $HOME/rpmbuild/RPMS/x86_64/gridtracker-*.x86_64.rpm build/rpm
+    - |
+      echo -e "\e[0Ksection_start:`date +%s`:native_build\r\e[0KBuilding native packages"
+      npm install --prefer-offline
+      npm run dist
+      for dir in dist/*-linux-* ; do if [ -d $dir ] ; then tar -C dist -czf ${dir}.tar.gz `basename $dir` ; fi ; done
+      echo `pwd`
+      (cd dist ; mv *.exe *-mac-x64.zip *.tar.gz ../artifacts)
+      echo -e "\e[0Ksection_end:`date +%s`:native_build\e[0K"
+    - |
+      echo -e "\e[0Ksection_start:`date +%s`:debian_build\r\e[0KBuilding Debian packages"
+      echo `pwd`
+      dpkg-buildpackage -uc -us
+      echo `pwd`
+      mv ../*.{deb,dsc,buildinfo,tar.xz,changes} artifacts/debian/
+      echo -e "\e[0Ksection_end:`date +%s`:debian_build\r\e[0K"
+    - |
+      echo -e "\e[0Ksection_start:`date +%s`:rpm_build\r\e[0KBuilding RPM packages"
+      cp artifacts/*.tar.gz $HOME/rpmbuild/SOURCES/
+      setarch i386 rpmbuild -D "version `node ./version.js`" --build-in-place -bb gridtracker.i386.spec
+      setarch x86_64 rpmbuild -D "version `node ./version.js`" --build-in-place -bb gridtracker.x86_64.spec
+      mv $HOME/rpmbuild/RPMS/i386/*.rpm artifacts/rpm/
+      mv $HOME/rpmbuild/RPMS/x86_64/*.rpm artifacts/rpm/
+      ls -laR artifacts
+      echo -e "\e[0Ksection_end:`date +%s`:rpm_build\r\e[0K"
     - echo "we made packages!"
 
 # copy the assets over to our distribution storage (testing, tag = test_.*)