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

Merge branch 'gitlab-registry' into 'develop' 

Move to Gitlab registry

See merge request b0/spectral!45
This commit is contained in:
Black Hat 2019-04-29 13:28:22 +00:00
parent d8c98374e4 5c7504e302
commit 4a357e5f95
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@ -3,30 +3,42 @@ stages:
- deploy - deploy
build-flatpak: build-flatpak:
image: black0/flatpak image: registry.gitlab.com/b0/flatpak-kde-docker
stage: build stage: build
before_script: before_script:
- git submodule update --init --recursive - git submodule update --init --recursive
script: script:
- cd flatpak - 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 - flatpak build-bundle repo spectral.flatpak org.eu.encom.spectral
- cd ../ - cd ../
cache:
key: flatpak
paths:
- flatpak/.flatpak-builder
artifacts: artifacts:
paths: paths:
- flatpak/spectral.flatpak - flatpak/spectral.flatpak
build-appimage: build-appimage:
image: black0/qt image: registry.gitlab.com/b0/qt-docker
stage: build stage: build
before_script: before_script:
- git submodule update --init --recursive - git submodule update --init --recursive
script: 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/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
- make INSTALL_ROOT=appdir install - 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 - /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: artifacts:
paths: paths:
- Spectral*.AppImage - Spectral*.AppImage