diff options
| author | chriseth <chris@ethereum.org> | 2017-09-28 22:01:10 +0800 |
|---|---|---|
| committer | chriseth <chris@ethereum.org> | 2017-09-29 21:31:00 +0800 |
| commit | 3be37d15e0ac51ca57fd2749609ed7c6dcdc8b07 (patch) | |
| tree | e6b3937dd2020a40656c7b6913b8bd5f622c4bb8 | |
| parent | 5028ccbe84cc0732ce9e84c9f55fa2cf8fd7f666 (diff) | |
| download | dexon-solidity-3be37d15e0ac51ca57fd2749609ed7c6dcdc8b07.tar dexon-solidity-3be37d15e0ac51ca57fd2749609ed7c6dcdc8b07.tar.gz dexon-solidity-3be37d15e0ac51ca57fd2749609ed7c6dcdc8b07.tar.bz2 dexon-solidity-3be37d15e0ac51ca57fd2749609ed7c6dcdc8b07.tar.lz dexon-solidity-3be37d15e0ac51ca57fd2749609ed7c6dcdc8b07.tar.xz dexon-solidity-3be37d15e0ac51ca57fd2749609ed7c6dcdc8b07.tar.zst dexon-solidity-3be37d15e0ac51ca57fd2749609ed7c6dcdc8b07.zip | |
Install libz3-dev from PPA if the distribution does not provide it.
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rwxr-xr-x | scripts/install_deps.sh | 17 |
2 files changed, 8 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index c30e3e0f..708d3620 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,13 +49,6 @@ env: matrix: 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 dist: trusty sudo: required diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index 3a1abe10..01dee81d 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -256,15 +256,6 @@ case $(uname -s) in #------------------------------------------------------------------------------ # 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) @@ -320,6 +311,14 @@ case $(uname -s) in libboost-all-dev \ "$install_z3" 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. # We will not use this 'eth', but its dependencies sudo add-apt-repository -y ppa:ethereum/ethereum |