tan
/
Spectral
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/b0/matrique

This commit is contained in:
Black Hat 2018-08-13 13:33:53 +08:00
parent d1b929788e 4fa0bed2fb
commit c765af9bce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
- deploy - deploy
preparation-flatpak: preparation-flatpak:
image: black0/alpine image: registry.gitlab.com/b0/matrique/alpine
stage: preparation stage: preparation
before_script: before_script:
- mkdir -p tmp - mkdir -p tmp
@ -17,7 +17,7 @@ preparation-flatpak:
- tmp/ - tmp/
build-native: build-native:
image: rabits/qt:5.11-desktop image: registry.gitlab.com/b0/matrique/qt
stage: build stage: build
cache: {} cache: {}
before_script: before_script:
@ -28,7 +28,7 @@ build-native:
- make -j4 - make -j4
build-flatpak: build-flatpak:
image: black0/flatpak image: registry.gitlab.com/b0/matrique/flatpak
stage: build stage: build
before_script: before_script:
- git submodule update --init --recursive - git submodule update --init --recursive
@ -44,7 +44,7 @@ build-flatpak:
deploy-flatpak: deploy-flatpak:
only: only:
- master - master
image: black0/alpine image: registry.gitlab.com/b0/matrique/alpine
stage: deploy stage: deploy
before_script: before_script:
- git config --global user.name "$GIT_NAME" - git config --global user.name "$GIT_NAME"