d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix more ci script issues

Browse source
This commit is contained in:
redsky17 2019-01-31 23:48:52 +00:00
parent 7a23e17625
commit 0627f4ae62
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.ci/install.sh
View file

@ -2,7 +2,7 @@
set -ex set -ex
if [ $TRAVIS_OS_NAME == osx ]; then if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew update brew update
brew install qt5 lmdb clang-format ninja libsodium cmark brew install qt5 lmdb clang-format ninja libsodium cmark
brew upgrade boost cmake || true brew upgrade boost cmake || true
@ -17,7 +17,7 @@ if [ $TRAVIS_OS_NAME == osx ]; then
fi fi
if [ $TRAVIS_OS_NAME == linux ]; then if [ "$TRAVIS_OS_NAME" == "linux" ]; then
if [ -z "$QT_VERSION" ]; then if [ -z "$QT_VERSION" ]; then
QT_VERSION="592" QT_VERSION="592"

10
.ci/script.sh
View file

@ -2,7 +2,7 @@
set -ex set -ex
if [ $TRAVIS_OS_NAME == linux ]; then if [ "$TRAVIS_OS_NAME" == "linux" ]; then
export CC=${C_COMPILER} export CC=${C_COMPILER}
export CXX=${CXX_COMPILER} export CXX=${CXX_COMPILER}
@ -13,11 +13,11 @@ if [ $TRAVIS_OS_NAME == linux ]; then
sudo update-alternatives --set g++ "/usr/bin/${CXX_COMPILER}" sudo update-alternatives --set g++ "/usr/bin/${CXX_COMPILER}"
fi fi
if [ $TRAVIS_OS_NAME == linux ]; then if [ "$TRAVIS_OS_NAME" == "linux" ]; then
source /opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh || true; source /opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh || true;
fi fi
if [ $TRAVIS_OS_NAME == osx ]; then if [ "$TRAVIS_OS_NAME" == "osx" ]; then
export CMAKE_PREFIX_PATH=/usr/local/opt/qt5 export CMAKE_PREFIX_PATH=/usr/local/opt/qt5
fi fi
@ -33,7 +33,7 @@ cmake -GNinja -H. -Bbuild \
-DCMAKE_INSTALL_PREFIX=.deps/usr -DCMAKE_INSTALL_PREFIX=.deps/usr
cmake --build build cmake --build build
if [ $TRAVIS_OS_NAME == osx ]; then if [ "$TRAVIS_OS_NAME" == "osx" ]; then
make lint; make lint;
if [ $DEPLOYMENT == 1 ] && [ ! -z $VERSION ] ; then if [ $DEPLOYMENT == 1 ] && [ ! -z $VERSION ] ; then
@ -41,6 +41,6 @@ if [ $TRAVIS_OS_NAME == osx ]; then
fi fi
fi fi
if [ $TRAVIS_OS_NAME == linux ] && [ $DEPLOYMENT == 1 ] && [ ! -z $VERSION ] ; then if [ "$TRAVIS_OS_NAME" == "linux" ] && [ $DEPLOYMENT == 1 ] && [ ! -z $VERSION ]; then
make linux-deploy; make linux-deploy;
fi fi