diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2016-10-14 09:14:17 +0200 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2016-10-14 09:14:17 +0200 |
| commit | 85cf7b165a44f45252759383d3cbf049425b41e0 (patch) | |
| tree | 3782f07817b01fa15740c1952f03b00285e5fa91 | |
| parent | 8049a43800b32b17978c3148a3b149c4da1e2e29 (diff) | |
| download | pandoc-85cf7b165a44f45252759383d3cbf049425b41e0.tar.gz | |
Travis: test with lts-7 not lts-6.
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | stack.lts6.yaml | 16 |
2 files changed, 5 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml index b9f3163a5..866acfe09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,17 +47,17 @@ matrix: # The Stack builds. We can pass in arbitrary Stack arguments via the ARGS # variable, such as using --stack-yaml to point to a different file. - - env: BUILD=stack ARGS="--resolver lts-6 --stack-yaml stack.lts6.yaml" - compiler: ": #stack 7.10.3" - addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}} + - env: BUILD=stack ARGS="--resolver lts-7" + compiler: ": #stack 8.0.1" + addons: {apt: {packages: [ghc-8.0.1], sources: [hvr-ghc]}} # Nightly builds are allowed to fail - env: BUILD=stack ARGS="--resolver nightly" compiler: ": #stack nightly" addons: {apt: {packages: [libgmp-dev]}} - - env: BUILD=stack ARGS="--resolver lts-6 --stack-yaml stack.lts6.yaml" - compiler: ": #stack 7.10.3 osx" + - env: BUILD=stack ARGS="--resolver lts-7" + compiler: ": #stack 8.0.1 osx" os: osx - env: BUILD=stack ARGS="--resolver nightly" diff --git a/stack.lts6.yaml b/stack.lts6.yaml deleted file mode 100644 index 7b497479e..000000000 --- a/stack.lts6.yaml +++ /dev/null @@ -1,16 +0,0 @@ -flags: - pandoc: - trypandoc: false - https: true - embed_data_files: false - old-locale: false - network-uri: true -packages: -- '.' -extra-deps: -- data-default-0.6.0 -- http-client-0.5.0 -- http-client-tls-0.3.0 -- doctemplates-0.1.0.2 -- cmark-0.5.3.1 -resolver: lts-6.5 |