From 7a72d30195ebd1031a12100322cfb8ae7054eb03 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Thu, 2 Aug 2018 20:33:24 +0000 Subject: [PATCH] Fix Debian. --- .gitlab-ci.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30d4c4a..869a74a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,35 +2,33 @@ stages: - preparation - build - deploy + +cache: + paths: + - tmp/ preparation-flatpak: image: debian:latest stage: preparation before_script: - mkdir tmp - - apt update - - apt install git + - apt-get update + - apt-get install -y git script: - cd tmp - git clone "https://$GIT_USERNAME:$GIT_PASSWORD@gitlab.com/b0/matrique-repo" - cd ../ - artifacts: - paths: - - tmp/ build-native: image: rabits/qt:5.11-desktop stage: build + cache: {} before_script: - git submodule update --init --recursive script: - mkdir build && cd build - qmake ../matrique.pro -spec linux-g++ CONFIG+=qtquickcompiler - make -j4 - - artifacts: - paths: - - build/ build-flatpak: image: black0/flatpak @@ -42,9 +40,6 @@ build-flatpak: - cd flatpak - flatpak-builder --repo=../tmp/matrique-repo/public build-dir org.eu.encom.matrique.json --force-clean --gpg-sign=52986BF4D61350EC249F2E891B0DB3358FC5E4B2 - cd ../ - artifacts: - paths: - - tmp/ deploy-flatpak: image: alpine/git