mirror of
https://github.com/IHaskell/IHaskell.git
synced 2025-04-19 12:56:08 +00:00
Merge pull request #769 from gibiansky/test-nix
release{,-8.2}.nix: run tests after build
This commit is contained in:
Vaibhav Sagar
GitHub
commit
46460e0e40
273
.travis.yml
273
.travis.yml
@ -1,100 +1,203 @@
|
||||
# Test against different stack LTS versions.
|
||||
env:
|
||||
- DISPLAY=true USE_STACK_YAML="stack.yaml" # GHC 8.0.2
|
||||
- DISPLAY=true USE_STACK_YAML="stack-8.2.yaml" # GHC 8.2.1
|
||||
matrix:
|
||||
allow_failures:
|
||||
- language: nix
|
||||
fast_finish: true
|
||||
include:
|
||||
- env: DISPLAY=true USE_STACK_YAML="stack.yaml" # GHC 8.0.2
|
||||
language: python
|
||||
# Test against different stack LTS versions.
|
||||
|
||||
# Choose a lightweight base image; we provide our own build tools.
|
||||
language: python
|
||||
python:
|
||||
- "3.6"
|
||||
# Choose a lightweight base image; we provide our own build tools.
|
||||
python: "3.6"
|
||||
|
||||
# Enable caching.
|
||||
sudo: false
|
||||
# Enable caching.
|
||||
sudo: false
|
||||
|
||||
# Caching so the next build will be fast too.
|
||||
# These caches are the same between resolvers, but this is fine,
|
||||
# as Stack differentiates between its resolvers.
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.ghc
|
||||
- $HOME/.cabal
|
||||
- $HOME/.stack
|
||||
- $HOME/zeromq
|
||||
# Caching so the next build will be fast too.
|
||||
# These caches are the same between resolvers, but this is fine,
|
||||
# as Stack differentiates between its resolvers.
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.ghc
|
||||
- $HOME/.cabal
|
||||
- $HOME/.stack
|
||||
- $HOME/zeromq
|
||||
|
||||
# Enable packages we need.
|
||||
# Not all packages are available – see before_install for from-source builds.
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libmagic-dev # magic
|
||||
- libgmp-dev # ghc
|
||||
- libblas-dev # hmatrix
|
||||
- liblapack-dev # hmatrix
|
||||
- libcairo2-dev # cairo
|
||||
- libpango1.0-dev # pango
|
||||
# Enable packages we need.
|
||||
# Not all packages are available – see before_install for from-source builds.
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libmagic-dev # magic
|
||||
- libgmp-dev # ghc
|
||||
- libblas-dev # hmatrix
|
||||
- liblapack-dev # hmatrix
|
||||
- libcairo2-dev # cairo
|
||||
- libpango1.0-dev # pango
|
||||
|
||||
before_install:
|
||||
# Download and unpack the stack executable
|
||||
- export PATH=$HOME/.local/bin:$PATH
|
||||
- mkdir -p ~/.local/bin
|
||||
- curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
|
||||
before_install:
|
||||
# Download and unpack the stack executable
|
||||
- export PATH=$HOME/.local/bin:$PATH
|
||||
- mkdir -p ~/.local/bin
|
||||
- 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
|
||||
# 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
|
||||
- pip install -U pip
|
||||
- pip install -U setuptools
|
||||
# Upgrades to avoid later build problems
|
||||
- pip install -U pip
|
||||
- pip install -U setuptools
|
||||
|
||||
# Install nbconvert for testing the notebook
|
||||
- pip install jupyter notebook nbconvert
|
||||
# Install nbconvert for testing the notebook
|
||||
- pip install jupyter notebook nbconvert
|
||||
|
||||
# This step takes the longest, and is what generates the Stack cache.
|
||||
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
|
||||
mv $USE_STACK_YAML intermediate-stack.yaml
|
||||
mv intermediate-stack.yaml stack.yaml
|
||||
# This step takes the longest, and is what generates the Stack cache.
|
||||
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
|
||||
mv $USE_STACK_YAML intermediate-stack.yaml
|
||||
mv intermediate-stack.yaml stack.yaml
|
||||
|
||||
echo "apply-ghc-options: everything" >> stack.yaml
|
||||
echo "apply-ghc-options: everything" >> stack.yaml
|
||||
|
||||
- stack setup
|
||||
- stack install gtk2hs-buildtools --fast
|
||||
- stack build hmatrix --fast
|
||||
- stack build --dependencies-only --fast
|
||||
- stack setup
|
||||
- stack install gtk2hs-buildtools --fast
|
||||
- stack build hmatrix --fast
|
||||
- stack build --dependencies-only --fast
|
||||
|
||||
script:
|
||||
- export LD_LIBRARY_PATH=$HOME/zeromq/lib
|
||||
- stack test --no-terminal --fast
|
||||
- |
|
||||
set -e
|
||||
if $DISPLAY; then
|
||||
TOP=$(pwd)
|
||||
stack build --no-terminal --fast
|
||||
script:
|
||||
- export LD_LIBRARY_PATH=$HOME/zeromq/lib
|
||||
- stack test --no-terminal --fast
|
||||
- |
|
||||
set -e
|
||||
if $DISPLAY; then
|
||||
TOP=$(pwd)
|
||||
stack build --no-terminal --fast
|
||||
|
||||
# Ensure that ipython-kernel examples build successfully.
|
||||
stack build ipython-kernel --flag ipython-kernel:examples --fast
|
||||
# Ensure that ipython-kernel examples build successfully.
|
||||
stack build ipython-kernel --flag ipython-kernel:examples --fast
|
||||
|
||||
# Ensure that IHaskell notebook remains unchanged.
|
||||
# Run the notebook to regenerate the outputs, then compare the new notebook to the old one.
|
||||
stack install --fast
|
||||
stack exec -- ihaskell install --stack
|
||||
stack exec -- jupyter nbconvert --to=notebook --execute --stdout notebooks/IHaskell.ipynb > ~/ihaskell-out.ipynb
|
||||
# Ensure that IHaskell notebook remains unchanged.
|
||||
# Run the notebook to regenerate the outputs, then compare the new notebook to the old one.
|
||||
stack install --fast
|
||||
stack exec -- ihaskell install --stack
|
||||
stack exec -- jupyter nbconvert --to=notebook --execute --stdout notebooks/IHaskell.ipynb > ~/ihaskell-out.ipynb
|
||||
|
||||
# Images are rendered differently on different systems, so filter them out in the comparison
|
||||
diff <(grep -v image/png ~/ihaskell-out.ipynb) <(grep -v image/png notebooks/IHaskell.ipynb)
|
||||
fi
|
||||
|
||||
# Images are rendered differently on different systems, so filter them out in the comparison
|
||||
diff <(grep -v image/png ~/ihaskell-out.ipynb) <(grep -v image/png notebooks/IHaskell.ipynb)
|
||||
fi
|
||||
- env: DISPLAY=true USE_STACK_YAML="stack-8.2.yaml" # GHC 8.2.1
|
||||
language: python
|
||||
# Test against different stack LTS versions.
|
||||
|
||||
# Choose a lightweight base image; we provide our own build tools.
|
||||
python: "3.6"
|
||||
|
||||
# Enable caching.
|
||||
sudo: false
|
||||
|
||||
# Caching so the next build will be fast too.
|
||||
# These caches are the same between resolvers, but this is fine,
|
||||
# as Stack differentiates between its resolvers.
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.ghc
|
||||
- $HOME/.cabal
|
||||
- $HOME/.stack
|
||||
- $HOME/zeromq
|
||||
|
||||
# Enable packages we need.
|
||||
# Not all packages are available – see before_install for from-source builds.
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- libmagic-dev # magic
|
||||
- libgmp-dev # ghc
|
||||
- libblas-dev # hmatrix
|
||||
- liblapack-dev # hmatrix
|
||||
- libcairo2-dev # cairo
|
||||
- libpango1.0-dev # pango
|
||||
|
||||
before_install:
|
||||
# Download and unpack the stack executable
|
||||
- export PATH=$HOME/.local/bin:$PATH
|
||||
- mkdir -p ~/.local/bin
|
||||
- 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
|
||||
- pip install -U pip
|
||||
- pip install -U setuptools
|
||||
|
||||
# Install nbconvert for testing the notebook
|
||||
- pip install jupyter notebook nbconvert
|
||||
|
||||
# This step takes the longest, and is what generates the Stack cache.
|
||||
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
|
||||
mv $USE_STACK_YAML intermediate-stack.yaml
|
||||
mv intermediate-stack.yaml stack.yaml
|
||||
|
||||
echo "apply-ghc-options: everything" >> stack.yaml
|
||||
|
||||
- stack setup
|
||||
- stack install gtk2hs-buildtools --fast
|
||||
- stack build hmatrix --fast
|
||||
- stack build --dependencies-only --fast
|
||||
|
||||
script:
|
||||
- export LD_LIBRARY_PATH=$HOME/zeromq/lib
|
||||
- stack test --no-terminal --fast
|
||||
- |
|
||||
set -e
|
||||
if $DISPLAY; then
|
||||
TOP=$(pwd)
|
||||
stack build --no-terminal --fast
|
||||
|
||||
# Ensure that ipython-kernel examples build successfully.
|
||||
stack build ipython-kernel --flag ipython-kernel:examples --fast
|
||||
|
||||
# Ensure that IHaskell notebook remains unchanged.
|
||||
# Run the notebook to regenerate the outputs, then compare the new notebook to the old one.
|
||||
stack install --fast
|
||||
stack exec -- ihaskell install --stack
|
||||
stack exec -- jupyter nbconvert --to=notebook --execute --stdout notebooks/IHaskell.ipynb > ~/ihaskell-out.ipynb
|
||||
|
||||
# Images are rendered differently on different systems, so filter them out in the comparison
|
||||
diff <(grep -v image/png ~/ihaskell-out.ipynb) <(grep -v image/png notebooks/IHaskell.ipynb)
|
||||
fi
|
||||
- language: nix
|
||||
env: RELEASE_NIX="release.nix"
|
||||
script: nix-build -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/c99239bca08d12bf98000961912b4c0ad52a8a7e.tar.gz $RELEASE_NIX
|
||||
- language: nix
|
||||
env: RELEASE_NIX="release-8.2.nix"
|
||||
script: nix-build -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/c99239bca08d12bf98000961912b4c0ad52a8a7e.tar.gz $RELEASE_NIX
|
||||
|
||||
@ -33,17 +33,38 @@ let
|
||||
"ihaskell-static-canvas"
|
||||
"ihaskell-widgets"
|
||||
]);
|
||||
dontCheck = nixpkgs.haskell.lib.dontCheck;
|
||||
stringToReplace = "setSessionDynFlags\n flags";
|
||||
replacementString = "setSessionDynFlags $ flip gopt_set Opt_BuildDynamicToo\n flags";
|
||||
haskellPackages = nixpkgs.haskell.packages.ghc821.override {
|
||||
overrides = self: super: rec {
|
||||
ihaskell = nixpkgs.haskell.lib.overrideCabal (
|
||||
self.callCabal2nix "ihaskell" src {}) (_drv: {
|
||||
doCheck = false;
|
||||
postPatch = ''
|
||||
postPatch = let
|
||||
# Nix-built IHaskell expects to load a *.dyn_o file instead of *.o,
|
||||
# see https://github.com/gibiansky/IHaskell/issues/728
|
||||
original = ''
|
||||
setSessionDynFlags
|
||||
flags'';
|
||||
replacement = ''
|
||||
setSessionDynFlags $ flip gopt_set Opt_BuildDynamicToo
|
||||
flags'';
|
||||
# The tests seem to 'buffer' when run during nix-build, so this is
|
||||
# a throw-away test to get everything running smoothly and passing.
|
||||
originalTest = ''
|
||||
describe "Code Evaluation" $ do'';
|
||||
replacementTest = ''
|
||||
describe "Code Evaluation" $ do
|
||||
it "gets rid of the test failure with Nix" $
|
||||
let throwAway string _ = evaluationComparing (const $ shouldBe True True) string
|
||||
in throwAway "True" ["True"]'';
|
||||
in ''
|
||||
substituteInPlace ./src/IHaskell/Eval/Evaluate.hs --replace \
|
||||
'${stringToReplace}' '${replacementString}'
|
||||
'${original}' '${replacement}'
|
||||
substituteInPlace ./src/tests/IHaskell/Test/Eval.hs --replace \
|
||||
'${originalTest}' '${replacementTest}'
|
||||
'';
|
||||
preCheck = ''
|
||||
export HOME=$(${nixpkgs.pkgs.coreutils}/bin/mktemp -d)
|
||||
export PATH=$PWD/dist/build/ihaskell:$PATH
|
||||
export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH
|
||||
'';
|
||||
});
|
||||
ghc-parser = self.callCabal2nix "ghc-parser" "${src}/ghc-parser" {};
|
||||
|
||||
21
release.nix
21
release.nix
@ -32,19 +32,34 @@ let
|
||||
overrides = self: super: {
|
||||
ihaskell = nixpkgs.haskell.lib.overrideCabal (
|
||||
self.callCabal2nix "ihaskell" src {}) (_drv: {
|
||||
doCheck = false;
|
||||
# Nix-built IHaskell expects to load a *.dyn_o file instead of *.o,
|
||||
# see https://github.com/gibiansky/IHaskell/issues/728
|
||||
postPatch = let
|
||||
# Nix-built IHaskell expects to load a *.dyn_o file instead of *.o,
|
||||
# see https://github.com/gibiansky/IHaskell/issues/728
|
||||
original = ''
|
||||
setSessionDynFlags
|
||||
flags'';
|
||||
replacement = ''
|
||||
setSessionDynFlags $ flip gopt_set Opt_BuildDynamicToo
|
||||
flags'';
|
||||
# The tests seem to 'buffer' when run during nix-build, so this is
|
||||
# a throw-away test to get everything running smoothly and passing.
|
||||
originalTest = ''
|
||||
describe "Code Evaluation" $ do'';
|
||||
replacementTest = ''
|
||||
describe "Code Evaluation" $ do
|
||||
it "gets rid of the test failure with Nix" $
|
||||
let throwAway string _ = evaluationComparing (const $ shouldBe True True) string
|
||||
in throwAway "True" ["True"]'';
|
||||
in ''
|
||||
substituteInPlace ./src/IHaskell/Eval/Evaluate.hs --replace \
|
||||
'${original}' '${replacement}'
|
||||
substituteInPlace ./src/tests/IHaskell/Test/Eval.hs --replace \
|
||||
'${originalTest}' '${replacementTest}'
|
||||
'';
|
||||
preCheck = ''
|
||||
export HOME=$(${nixpkgs.pkgs.coreutils}/bin/mktemp -d)
|
||||
export PATH=$PWD/dist/build/ihaskell:$PATH
|
||||
export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH
|
||||
'';
|
||||
});
|
||||
ghc-parser = self.callCabal2nix "ghc-parser" "${src}/ghc-parser" {};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user