Merge pull request #1875 from szeck87/travis-fix
Add --user for linux pip installs and init opam for MacOS
This commit is contained in:
commit
ebfcb7ab29
30
.travis.yml
30
.travis.yml
|
@ -107,12 +107,22 @@ before_install:
|
||||||
docker pull unibeautify/sass-convert;
|
docker pull unibeautify/sass-convert;
|
||||||
fi
|
fi
|
||||||
# Python language support
|
# Python language support
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo chmod 777 -R /opt/python; fi
|
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||||
- pip install --upgrade pip
|
sudo chmod 777 -R /opt/python;
|
||||||
- pip install --upgrade autopep8
|
pip install --upgrade pip;
|
||||||
- pip install --upgrade isort
|
pip install --user --upgrade autopep8;
|
||||||
|
pip install --user --upgrade isort;
|
||||||
|
else
|
||||||
|
pip install --upgrade pip;
|
||||||
|
pip install --upgrade autopep8;
|
||||||
|
pip install --upgrade isort;
|
||||||
|
fi
|
||||||
# SQL language support
|
# SQL language support
|
||||||
- pip install --upgrade sqlparse
|
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||||
|
pip install --user --upgrade sqlparse;
|
||||||
|
else
|
||||||
|
pip install --upgrade sqlparse;
|
||||||
|
fi
|
||||||
# Java, C, C++, C#, Objective-C, D, Pawn, Vala
|
# Java, C, C++, C#, Objective-C, D, Pawn, Vala
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||||
brew install uncrustify;
|
brew install uncrustify;
|
||||||
|
@ -163,8 +173,16 @@ before_install:
|
||||||
brew install opam;
|
brew install opam;
|
||||||
fi
|
fi
|
||||||
- opam init --auto-setup
|
- opam init --auto-setup
|
||||||
|
# Init environment variables for opam
|
||||||
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||||
|
eval `opam config env`;
|
||||||
|
fi
|
||||||
- opam install --yes ocp-indent
|
- opam install --yes ocp-indent
|
||||||
# Crystal
|
# Crystal
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install crystal-lang; fi
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install crystal-lang; fi
|
||||||
# Bash
|
# Bash
|
||||||
- pip install beautysh
|
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||||
|
pip install --user beautysh;
|
||||||
|
else
|
||||||
|
pip install beautysh;
|
||||||
|
fi
|
Loading…
Reference in New Issue