Skip to content
Snippets Groups Projects
Commit 0627f4ae authored by Joe Donofry's avatar Joe Donofry
Browse files

Fix more ci script issues

parent 7a23e176
No related branches found
No related tags found
No related merge requests found
......@@ -2,7 +2,7 @@
set -ex
if [ $TRAVIS_OS_NAME == osx ]; then
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew update
brew install qt5 lmdb clang-format ninja libsodium cmark
brew upgrade boost cmake || true
......@@ -17,7 +17,7 @@ if [ $TRAVIS_OS_NAME == osx ]; then
fi
if [ $TRAVIS_OS_NAME == linux ]; then
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
if [ -z "$QT_VERSION" ]; then
QT_VERSION="592"
......
......@@ -2,7 +2,7 @@
set -ex
if [ $TRAVIS_OS_NAME == linux ]; then
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
export CC=${C_COMPILER}
export CXX=${CXX_COMPILER}
......@@ -13,11 +13,11 @@ if [ $TRAVIS_OS_NAME == linux ]; then
sudo update-alternatives --set g++ "/usr/bin/${CXX_COMPILER}"
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;
fi
if [ $TRAVIS_OS_NAME == osx ]; then
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
export CMAKE_PREFIX_PATH=/usr/local/opt/qt5
fi
......@@ -33,7 +33,7 @@ cmake -GNinja -H. -Bbuild \
-DCMAKE_INSTALL_PREFIX=.deps/usr
cmake --build build
if [ $TRAVIS_OS_NAME == osx ]; then
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
make lint;
if [ $DEPLOYMENT == 1 ] && [ ! -z $VERSION ] ; then
......@@ -41,6 +41,6 @@ if [ $TRAVIS_OS_NAME == osx ]; then
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;
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment