diff options
| author | redsky17 <joedonofry@gmail.com> | 2019-01-31 23:48:52 +0000 |
|---|---|---|
| committer | redsky17 <joedonofry@gmail.com> | 2019-01-31 23:48:52 +0000 |
| commit | 0627f4ae622fa4cb9f01c01e82fa372b1b986662 (patch) | |
| tree | e24ff469739b5f832430df49716ce641daa65b1b /.ci | |
| parent | 7a23e1762575786f1d9c8822d51e863a1125a048 (diff) | |
Fix more ci script issues
Diffstat (limited to '.ci')
| -rwxr-xr-x | .ci/install.sh | 4 | ||||
| -rwxr-xr-x | .ci/script.sh | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.ci/install.sh b/.ci/install.sh index 59114baf..b0063c06 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -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" diff --git a/.ci/script.sh b/.ci/script.sh index d3aeb417..ce65cb14 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -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 |