From 5c7504e3021aa8b8ea7d068d47e6bb73f0466941 Mon Sep 17 00:00:00 2001
From: Black Hat <bhat@encom.eu.org>
Date: Mon, 29 Apr 2019 13:28:22 +0000
Subject: [PATCH] Move to Gitlab registry

---
 .gitlab-ci.yml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ef3ac9..7f33df1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,30 +3,42 @@ stages:
   - deploy
 
 build-flatpak:
-  image: black0/flatpak
+  image: registry.gitlab.com/b0/flatpak-kde-docker
   stage: build
   before_script:
     - git submodule update --init --recursive
   script:
     - cd flatpak
-    - flatpak-builder --force-clean --repo=repo build-dir org.eu.encom.spectral.yaml
+    - flatpak-builder --force-clean --ccache --repo=repo build-dir org.eu.encom.spectral.yaml
     - flatpak build-bundle repo spectral.flatpak org.eu.encom.spectral
     - cd ../
+  cache:
+    key: flatpak
+    paths:
+    - flatpak/.flatpak-builder
   artifacts:
     paths:
     - flatpak/spectral.flatpak
 
 build-appimage:
-  image: black0/qt
+  image: registry.gitlab.com/b0/qt-docker
   stage: build
   before_script:
     - git submodule update --init --recursive
   script:
+    - mkdir -p ccache
+    - export CCACHE_BASEDIR=${CI_PROJECT_DIR}
+    - export CCACHE_DIR=${CI_PROJECT_DIR}/ccache
     - /opt/qt512/bin/qt512-env.sh
-    - /opt/qt512/bin/qmake CONFIG+=debug CONFIG+=qml_debug PREFIX=/usr
+    - /opt/qt512/bin/qmake CONFIG+=debug CONFIG+=qml_debug CONFIG+=ccache PREFIX=/usr
     - make
     - make INSTALL_ROOT=appdir install
     - /usr/bin/linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/org.eu.encom.spectral.desktop -appimage -qmldir=qml -qmldir=imports -qmake=/opt/qt512/bin/qmake
+  cache:
+    key: ccache
+    paths:
+    - ccache/
+
   artifacts:
     paths:
     - Spectral*.AppImage