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

Merge branch 'fix-macos-ci' into 'master'

Browse Source 
Fix macOS CI

See merge request spectral-im/spectral!70
This commit is contained in:
Black Hat
2020-01-21 21:02:56 +00:00
parent b94ad5baed 8bb8563f9d
commit 8cfbe4143c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@@ -54,18 +54,18 @@ build-osx:
- 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.2/ -DBUILD_SHARED_LIBS=NO
- cmake . -Bbuild -LA -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install -DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.14.0/ -DBUILD_SHARED_LIBS=NO
- 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.2/ -DQTKEYCHAIN_STATIC=ON
- cmake . -Bbuild -LA -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install -DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.14.0/ -DQTKEYCHAIN_STATIC=ON
- 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.2/ -DOlm_DIR="olm/install/lib/cmake/Olm" -DQt5Keychain_DIR="qtkeychain/install/lib/cmake/Qt5Keychain"
- cmake . -Bbuild -LA -DUSE_INTREE_LIBQMC=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.14.0/ -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.2/bin/macdeployqt build/spectral.app -dmg -qmldir=qml -qmldir=imports
- /usr/local/Cellar/qt/5.14.0/bin/macdeployqt build/spectral.app -dmg -qmldir=qml -qmldir=imports
- mv build/spectral.dmg ./spectral.dmg
artifacts:
paths: