Commit 01b7f5a3 authored by Vaibhav Sagar's avatar Vaibhav Sagar

.travis.yml: install libzmq3-dev with apt-get

parent f80f90f7
...@@ -21,7 +21,6 @@ matrix: ...@@ -21,7 +21,6 @@ matrix:
- $HOME/.ghc - $HOME/.ghc
- $HOME/.cabal - $HOME/.cabal
- $HOME/.stack - $HOME/.stack
- $HOME/zeromq
# Enable packages we need. # Enable packages we need.
# Not all packages are available – see before_install for from-source builds. # Not all packages are available – see before_install for from-source builds.
...@@ -34,6 +33,7 @@ matrix: ...@@ -34,6 +33,7 @@ matrix:
- liblapack-dev # hmatrix - liblapack-dev # hmatrix
- libcairo2-dev # cairo - libcairo2-dev # cairo
- libpango1.0-dev # pango - libpango1.0-dev # pango
- libzmq3-dev # zmq
before_install: before_install:
# Download and unpack the stack executable # Download and unpack the stack executable
...@@ -41,20 +41,6 @@ matrix: ...@@ -41,20 +41,6 @@ matrix:
- mkdir -p ~/.local/bin - mkdir -p ~/.local/bin
- curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' - curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
# Install zeromq3 -- the package is not supported yet on Travis whitelist... (06/06/2016)
- |
if [ ! -d "$HOME/zeromq/lib" ]; then
export OLDPWD=$(pwd)
travis_retry git clone http://www.github.com/zeromq/zeromq4-x.git libzmq
mkdir $HOME/zeromq
cd libzmq
travis_retry ./autogen.sh
travis_retry ./configure --prefix=$HOME/zeromq
make
travis_retry make install
cd $OLDPWD
fi
# Upgrades to avoid later build problems # Upgrades to avoid later build problems
- pip install -U pip - pip install -U pip
- pip install -U setuptools - pip install -U setuptools
...@@ -64,8 +50,6 @@ matrix: ...@@ -64,8 +50,6 @@ matrix:
# This step takes the longest, and is what generates the Stack cache. # This step takes the longest, and is what generates the Stack cache.
install: install:
# Set path for pkg-config to find zeromq, otherwise install of zeromq4-haskell fails.
- export PKG_CONFIG_PATH=$HOME/zeromq/lib/pkgconfig/
- | - |
# Used to avoid 'source and destination file are the same' error # Used to avoid 'source and destination file are the same' error
mv $USE_STACK_YAML intermediate-stack.yaml mv $USE_STACK_YAML intermediate-stack.yaml
...@@ -79,7 +63,6 @@ matrix: ...@@ -79,7 +63,6 @@ matrix:
- stack build --dependencies-only --fast - stack build --dependencies-only --fast
script: script:
- export LD_LIBRARY_PATH=$HOME/zeromq/lib
- stack test --no-terminal --fast - stack test --no-terminal --fast
- | - |
set -e set -e
...@@ -117,7 +100,6 @@ matrix: ...@@ -117,7 +100,6 @@ matrix:
- $HOME/.ghc - $HOME/.ghc
- $HOME/.cabal - $HOME/.cabal
- $HOME/.stack - $HOME/.stack
- $HOME/zeromq
# Enable packages we need. # Enable packages we need.
# Not all packages are available – see before_install for from-source builds. # Not all packages are available – see before_install for from-source builds.
...@@ -130,6 +112,7 @@ matrix: ...@@ -130,6 +112,7 @@ matrix:
- liblapack-dev # hmatrix - liblapack-dev # hmatrix
- libcairo2-dev # cairo - libcairo2-dev # cairo
- libpango1.0-dev # pango - libpango1.0-dev # pango
- libzmq3-dev # zmq
before_install: before_install:
# Download and unpack the stack executable # Download and unpack the stack executable
...@@ -137,20 +120,6 @@ matrix: ...@@ -137,20 +120,6 @@ matrix:
- mkdir -p ~/.local/bin - mkdir -p ~/.local/bin
- curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' - curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
# Install zeromq3 -- the package is not supported yet on Travis whitelist... (06/06/2016)
- |
if [ ! -d "$HOME/zeromq/lib" ]; then
export OLDPWD=$(pwd)
travis_retry git clone http://www.github.com/zeromq/zeromq4-x.git libzmq
mkdir $HOME/zeromq
cd libzmq
travis_retry ./autogen.sh
travis_retry ./configure --prefix=$HOME/zeromq
make
travis_retry make install
cd $OLDPWD
fi
# Upgrades to avoid later build problems # Upgrades to avoid later build problems
- pip install -U pip - pip install -U pip
- pip install -U setuptools - pip install -U setuptools
...@@ -160,8 +129,6 @@ matrix: ...@@ -160,8 +129,6 @@ matrix:
# This step takes the longest, and is what generates the Stack cache. # This step takes the longest, and is what generates the Stack cache.
install: install:
# Set path for pkg-config to find zeromq, otherwise install of zeromq4-haskell fails.
- export PKG_CONFIG_PATH=$HOME/zeromq/lib/pkgconfig/
- | - |
# Used to avoid 'source and destination file are the same' error # Used to avoid 'source and destination file are the same' error
mv $USE_STACK_YAML intermediate-stack.yaml mv $USE_STACK_YAML intermediate-stack.yaml
...@@ -175,7 +142,6 @@ matrix: ...@@ -175,7 +142,6 @@ matrix:
- stack build --dependencies-only --fast - stack build --dependencies-only --fast
script: script:
- export LD_LIBRARY_PATH=$HOME/zeromq/lib
- stack test --no-terminal --fast - stack test --no-terminal --fast
- | - |
set -e set -e
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment