Merge branch 'master' into js-v8-52-tests
This commit is contained in:
commit
6c78195d75
459 changed files with 13117 additions and 4710 deletions
|
|
@ -13,6 +13,10 @@ elif [[ "$CC" == gcc-6 ]]; then
|
|||
travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
|
||||
travis_retry sudo apt-get -qq update
|
||||
travis_retry sudo apt-get install -qq g++-6
|
||||
elif [[ "$CC" == gcc-7 ]]; then
|
||||
travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
|
||||
travis_retry sudo apt-get -qq update
|
||||
travis_retry sudo apt-get install -qq g++-7
|
||||
fi
|
||||
|
||||
travis_retry sudo apt-get -qq install libboost-dev
|
||||
|
|
@ -86,13 +90,13 @@ case "$SWIGLANG" in
|
|||
travis_retry sudo apt-get -qq install php$VER-cli php$VER-dev
|
||||
;;
|
||||
"python")
|
||||
pip install pep8
|
||||
pip install --user pycodestyle
|
||||
if [[ "$PY3" ]]; then
|
||||
travis_retry sudo apt-get install -qq python3-dev
|
||||
fi
|
||||
WITHLANG=$SWIGLANG$PY3
|
||||
if [[ "$VER" ]]; then
|
||||
travis_retry sudo add-apt-repository -y ppa:fkrull/deadsnakes
|
||||
travis_retry sudo add-apt-repository -y ppa:deadsnakes/ppa
|
||||
travis_retry sudo apt-get -qq update
|
||||
travis_retry sudo apt-get -qq install python${VER}-dev
|
||||
WITHLANG=$SWIGLANG$PY3=$SWIGLANG$VER
|
||||
|
|
|
|||
|
|
@ -23,8 +23,7 @@ case "$SWIGLANG" in
|
|||
"python")
|
||||
WITHLANG=$SWIGLANG$PY3
|
||||
if [[ "$PY3" ]]; then
|
||||
travis_retry brew install python3
|
||||
travis_retry brew list -v python3
|
||||
travis_retry brew upgrade python
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue