ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'appimage' into 'master'

Browse Source 
Reenable AppImage CI

See merge request b0/spectral!65
This commit is contained in:
Black Hat
2019-09-29 20:49:27 +00:00
parent 29d01e6847 a85776a7c8
commit 887f69fac3
1 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
.gitlab-ci.yml
View File

@@ -2,21 +2,44 @@ stages:
- build
- deploy
variables:
GIT_SUBMODULE_STRATEGY: recursive
build-appimage:
image: registry.gitlab.com/b0/qt-docker
stage: build
script:
- git clone https://gitlab.matrix.org/matrix-org/olm.git && cd olm
- cmake . -Bbuild -LA -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install -DBUILD_SHARED_LIBS=NO
- cmake --build build --target install --parallel $(nproc)
- cd ..
- git clone https://github.com/frankosterfeld/qtkeychain.git && cd qtkeychain
- cmake . -Bbuild -LA -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install -DQTKEYCHAIN_STATIC=ON -DBUILD_TRANSLATIONS=NO
- cmake --build build --parallel $(nproc)
- sudo cmake --build build --target install
- cd ..
- git clone https://github.com/commonmark/cmark.git && cd cmark
- cmake . -Bbuild -LA -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install -DCMARK_SHARED=ON -DCMARK_STATIC=ON -DCMARK_TESTS=OFF
- cmake --build build --target install --parallel $(nproc)
- cd ..
- cmake . -Bbuild -LA -DUSE_INTREE_LIBQMC=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install/usr -DOlm_DIR="olm/install/lib/cmake/Olm" -DQt5Keychain_DIR="qtkeychain/install/lib/x86_64-linux-gnu/cmake/Qt5Keychain" -DCMARK_LIBRARY="$PWD/cmark/install/lib/libcmark.a" -DCMARK_INCLUDE_DIR="$PWD/cmark/install/include"
- cmake --build build --target install --parallel $(nproc)
- cp install/usr/share/icons/hicolor/256x256/apps/spectral.png install/org.eu.encom.spectral.png
- linuxdeployqt install/usr/share/applications/org.eu.encom.spectral.desktop -appimage -qmldir=qml -qmldir=imports
- mv *.AppImage spectral.AppImage
artifacts:
paths:
- spectral.AppImage
build-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 --ccache --repo=repo build-dir org.eu.encom.spectral.yaml
- flatpak-builder --force-clean --repo=repo build-dir org.eu.encom.spectral.yaml
- flatpak build-bundle repo spectral.flatpak org.eu.encom.spectral
- cd ../
- mv flatpak/spectral.flatpak ./spectral.flatpak
cache:
key: "flatpak-$CI_COMMIT_REF_SLUG"
paths:
- flatpak/.flatpak-builder
artifacts:
paths:
- spectral.flatpak
@@ -25,24 +48,22 @@ build-osx:
stage: build
tags:
- osx
before_script:
- git submodule update --init --recursive
- brew install cmark
script:
- brew install cmark
- rm -rf olm
- git clone https://gitlab.matrix.org/matrix-org/olm.git
- pushd olm
- cmake . -Bbuild -LA -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install -DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.13.1/ -DBUILD_SHARED_LIBS=NO
- cmake --build build --target install --parallel 16
- cmake --build build --target install --parallel $(sysctl -n hw.ncpu)
- popd
- rm -rf qtkeychain
- git clone https://github.com/frankosterfeld/qtkeychain.git
- pushd qtkeychain
- cmake . -Bbuild -LA -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install -DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.13.1/ -DQTKEYCHAIN_STATIC=ON
- cmake --build build --target install --parallel 16
- cmake --build build --target install --parallel $(sysctl -n hw.ncpu)
- popd
- cmake . -Bbuild -LA -DUSE_INTREE_LIBQMC=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.13.1/ -DOlm_DIR=olm/install/lib/cmake/Olm -DQt5Keychain_DIR="qtkeychain/install/lib/cmake/Qt5Keychain"
- cmake --build build --target all --parallel 16
- cmake . -Bbuild -LA -DUSE_INTREE_LIBQMC=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.13.1/ -DOlm_DIR="olm/install/lib/cmake/Olm" -DQt5Keychain_DIR="qtkeychain/install/lib/cmake/Qt5Keychain"
- cmake --build build --target all --parallel $(sysctl -n hw.ncpu)
- /usr/local/Cellar/qt/5.13.1/bin/macdeployqt build/spectral.app -dmg -qmldir=qml -qmldir=imports
- mv build/spectral.dmg ./spectral.dmg
artifacts: