cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Install libz3-dev from PPA if the distribution does not provide it.

Browse Source
This commit is contained in:
chriseth 2017-09-28 16:01:10 +02:00
parent 5028ccbe84
commit 3be37d15e0
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -49,13 +49,6 @@ env:
matrix: matrix:
include: include:
# Ubuntu 14.04 LTS "Trusty Tahr"
# https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#Ubuntu_14.04_LTS_.28Trusty_Tahr.29
#
# TravisCI doesn't directly support any new Ubuntu releases. These is
# some Docker support, which we should probably investigate, at least for
# Ubuntu 16.04 LTS "Xenial Xerus"
# See https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#Ubuntu_16.04_LTS_.28Xenial_Xerus.29.
- os: linux - os: linux
dist: trusty dist: trusty
sudo: required sudo: required

17
scripts/install_deps.sh
View File

@ -256,15 +256,6 @@ case $(uname -s) in
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Ubuntu # Ubuntu
# #
# TODO - I wonder whether all of the Ubuntu-variants need some special
# treatment?
#
# TODO - We should also test this code on Ubuntu Server, Ubuntu Snappy Core
# and Ubuntu Phone.
#
# TODO - Our Ubuntu build is only working for amd64 and i386 processors.
# It would be good to add armel, armhf and arm64.
# See https://github.com/ethereum/webthree-umbrella/issues/228.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
Ubuntu) Ubuntu)
@ -320,6 +311,14 @@ case $(uname -s) in
libboost-all-dev \ libboost-all-dev \
"$install_z3" "$install_z3"
if [ "$CI" = true ]; then if [ "$CI" = true ]; then
# install Z3 from PPA if the distribution does not provide it
if ! dpkg -l libz3-dev > /dev/null 2>&1
then
sudo apt-add-repository -y ppa:hvr/z3
sudo apt-get -y update
sudo apt-get -y install libz3-dev
fi
# Install 'eth', for use in the Solidity Tests-over-IPC. # Install 'eth', for use in the Solidity Tests-over-IPC.
# We will not use this 'eth', but its dependencies # We will not use this 'eth', but its dependencies
sudo add-apt-repository -y ppa:ethereum/ethereum sudo add-apt-repository -y ppa:ethereum/ethereum