Fix Debian.

This commit is contained in:
Black Hat 2018-08-02 20:33:24 +00:00
parent 46bae07d4d
commit 7a72d30195
1 changed files with 7 additions and 12 deletions

View File

@ -2,35 +2,33 @@ stages:
- preparation - preparation
- build - build
- deploy - deploy
cache:
paths:
- tmp/
preparation-flatpak: preparation-flatpak:
image: debian:latest image: debian:latest
stage: preparation stage: preparation
before_script: before_script:
- mkdir tmp - mkdir tmp
- apt update - apt-get update
- apt install git - apt-get install -y git
script: script:
- cd tmp - cd tmp
- git clone "https://$GIT_USERNAME:$GIT_PASSWORD@gitlab.com/b0/matrique-repo" - git clone "https://$GIT_USERNAME:$GIT_PASSWORD@gitlab.com/b0/matrique-repo"
- cd ../ - cd ../
artifacts:
paths:
- tmp/
build-native: build-native:
image: rabits/qt:5.11-desktop image: rabits/qt:5.11-desktop
stage: build stage: build
cache: {}
before_script: before_script:
- git submodule update --init --recursive - git submodule update --init --recursive
script: script:
- mkdir build && cd build - mkdir build && cd build
- qmake ../matrique.pro -spec linux-g++ CONFIG+=qtquickcompiler - qmake ../matrique.pro -spec linux-g++ CONFIG+=qtquickcompiler
- make -j4 - make -j4
artifacts:
paths:
- build/
build-flatpak: build-flatpak:
image: black0/flatpak image: black0/flatpak
@ -42,9 +40,6 @@ build-flatpak:
- cd flatpak - cd flatpak
- flatpak-builder --repo=../tmp/matrique-repo/public build-dir org.eu.encom.matrique.json --force-clean --gpg-sign=52986BF4D61350EC249F2E891B0DB3358FC5E4B2 - flatpak-builder --repo=../tmp/matrique-repo/public build-dir org.eu.encom.matrique.json --force-clean --gpg-sign=52986BF4D61350EC249F2E891B0DB3358FC5E4B2
- cd ../ - cd ../
artifacts:
paths:
- tmp/
deploy-flatpak: deploy-flatpak:
image: alpine/git image: alpine/git