Fix CI.
This commit is contained in:
@@ -27,15 +27,22 @@ build-osx:
|
||||
- osx
|
||||
before_script:
|
||||
- git submodule update --init --recursive
|
||||
- brew install cmark
|
||||
script:
|
||||
- pushd include/libQuotient/3rdparty/libQtOlm
|
||||
- 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
|
||||
- popd
|
||||
- mkdir build && pushd build
|
||||
- cmake .. -LA -DUSE_INTREE_LIBQMC=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.13.0/
|
||||
- cmake --build . --target all --parallel 16
|
||||
- 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
|
||||
- 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
|
||||
- /usr/local/Cellar/qt/5.13.0/bin/macdeployqt build/spectral.app -dmg -qmldir=qml -qmldir=imports
|
||||
- mv build/spectral.dmg ./spectral.dmg
|
||||
artifacts:
|
||||
|
||||
Reference in New Issue
Block a user