Unverified Commit d910a389 authored by Vaibhav Sagar's avatar Vaibhav Sagar Committed by GitHub

Merge pull request #935 from gibiansky/enable-display-8-4

Update .travis.yml
parents 83a823d5 0d3316cc
...@@ -80,7 +80,7 @@ matrix: ...@@ -80,7 +80,7 @@ matrix:
stack exec -- jupyter nbconvert --to=notebook --execute --stdout notebooks/IHaskell.ipynb > ~/ihaskell-out.ipynb 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 # 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) diff <(egrep -v 'image/png|version|pygments' ~/ihaskell-out.ipynb) <(egrep -v 'image/png|version|pygments' notebooks/IHaskell.ipynb)
fi fi
- env: DISPLAY=true USE_STACK_YAML="stack.yaml" # GHC 8.2.2 - env: DISPLAY=true USE_STACK_YAML="stack.yaml" # GHC 8.2.2
language: python language: python
...@@ -159,9 +159,9 @@ matrix: ...@@ -159,9 +159,9 @@ matrix:
stack exec -- jupyter nbconvert --to=notebook --execute --stdout notebooks/IHaskell.ipynb > ~/ihaskell-out.ipynb 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 # 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) diff <(egrep -v 'image/png|version|pygments' ~/ihaskell-out.ipynb) <(egrep -v 'image/png|version|pygments' notebooks/IHaskell.ipynb)
fi fi
- env: DISPLAY=false USE_STACK_YAML="stack-8.4.yaml" # GHC 8.4.1 - env: DISPLAY=true USE_STACK_YAML="stack-8.4.yaml" # GHC 8.4.3
language: python language: python
# Test against different stack LTS versions. # Test against different stack LTS versions.
...@@ -238,7 +238,7 @@ matrix: ...@@ -238,7 +238,7 @@ matrix:
stack exec -- jupyter nbconvert --to=notebook --execute --stdout notebooks/IHaskell.ipynb > ~/ihaskell-out.ipynb 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 # 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) diff <(egrep -v 'image/png|version|pygments' ~/ihaskell-out.ipynb) <(egrep -v 'image/png|version|pygments' notebooks/IHaskell.ipynb)
fi fi
- language: nix - language: nix
env: RELEASE_NIX="release.nix" env: RELEASE_NIX="release.nix"
...@@ -269,7 +269,7 @@ matrix: ...@@ -269,7 +269,7 @@ matrix:
ihaskell-static-canvas ihaskell-static-canvas
])' ])'
- result/bin/ihaskell-nbconvert --to=notebook --execute --stdout notebooks/IHaskell.ipynb > ~/ihaskell-out.ipynb - result/bin/ihaskell-nbconvert --to=notebook --execute --stdout notebooks/IHaskell.ipynb > ~/ihaskell-out.ipynb
- diff <(grep -v image/png ~/ihaskell-out.ipynb) <(grep -v image/png notebooks/IHaskell.ipynb) - diff <(egrep -v 'image/png|version|pygments' ~/ihaskell-out.ipynb) <(egrep -v 'image/png|version|pygments' notebooks/IHaskell.ipynb)
- language: nix - language: nix
env: RELEASE_NIX="release-8.2.nix" env: RELEASE_NIX="release-8.2.nix"
cache: cache:
...@@ -299,4 +299,4 @@ matrix: ...@@ -299,4 +299,4 @@ matrix:
ihaskell-static-canvas ihaskell-static-canvas
])' ])'
- result/bin/ihaskell-nbconvert --to=notebook --execute --stdout notebooks/IHaskell.ipynb > ~/ihaskell-out.ipynb - result/bin/ihaskell-nbconvert --to=notebook --execute --stdout notebooks/IHaskell.ipynb > ~/ihaskell-out.ipynb
- diff <(grep -v image/png ~/ihaskell-out.ipynb) <(grep -v image/png notebooks/IHaskell.ipynb) - diff <(egrep -v 'image/png|version|pygments' ~/ihaskell-out.ipynb) <(egrep -v 'image/png|version|pygments' notebooks/IHaskell.ipynb)
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