Fix OS detection

This commit is contained in:
Gregory John Casamento 2021-07-11 08:45:42 -04:00
parent 35776a972a
commit d4b38f618e
2 changed files with 7 additions and 5 deletions

View file

@ -5,7 +5,8 @@ set -ex
echo "Building..."
sudo apt-get -qq update
sudo apt-get install -y cmake pkg-config libgnutls28-dev libgmp-dev libffi-dev libicu-dev libxml2-dev libxslt1-dev libssl-dev libavahi-client-dev zlib1g-dev
sudo apt-get install -y cmake pkg-config libgnutls28-dev libgmp-dev libffi-dev \
libicu-dev libxml2-dev libxslt1-dev libssl-dev libavahi-client-dev zlib1g-dev
if [ $LIBRARY_COMBO = 'gnu-gnu-gnu' ];
then
@ -17,7 +18,8 @@ then
sudo apt-get install -y libobjc-8-dev libblocksruntime-dev;
else
curl -s -o - 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-9 main" && sudo apt-get update -qq;
sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main" && \
sudo apt-get update -qq;
sudo apt-get install -y clang-9 libkqueue-dev libpthread-workqueue-dev;
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 10 \
--slave /usr/bin/clang++ clang++ /usr/bin/clang++-9;

View file

@ -4,11 +4,11 @@ set -ex
DEP_SRC=$HOME/dependency_source/
case $TRAVIS_OS_NAME in
linux)
case $RUNNER_OS in
Linux)
DEP_ROOT=$HOME/staging
;;
windows)
Windows)
DEP_ROOT=/c/staging
;;
esac