Even more bash fixes >.<

azure-pipelines
Joseph Donofry 6 years ago
parent 8fe44c24f7
commit c9566369e8
No known key found for this signature in database
GPG Key ID: E8A1D78EF044B0CB
  1. 4
      .ci/install.sh
  2. 4
      .ci/script.sh

@ -39,7 +39,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
UBUNTU_RELEASE=$(lsb_release -sc)
if [ "$UBUNTU_RELEASE" eq "trusty" ]; then
if [ "$UBUNTU_RELEASE" = "trusty" ]; then
curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-add-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty main"
@ -49,7 +49,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty
# needed for git-lfs, otherwise the follow apt update fails.
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6B05F25D762E3157
elif [ "$UBUNTU_RELEASE" eq "xenial" ]; then
elif [ "$UBUNTU_RELEASE" = "xenial" ]; then
curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main"
sudo apt-get update -qq

@ -41,11 +41,11 @@ cmake --build build
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
make lint;
if [ "$DEPLOYMENT" = 1 ] && [ ! -z "$VERSION" ] ; then
if [ "$DEPLOYMENT" = 1 ] && [ -n "$VERSION" ] ; then
make macos-deploy;
fi
fi
if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$DEPLOYMENT" = 1 ] && [ ! -z "$VERSION" ]; then
if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$DEPLOYMENT" = 1 ] && [ -n "$VERSION" ]; then
make linux-deploy;
fi

Loading…
Cancel
Save