From 94a9db4b818b6bf57295a5cb649359391bd3afcc Mon Sep 17 00:00:00 2001 From: Michael Xavier Date: Mon, 15 Jan 2018 16:32:58 -0800 Subject: [PATCH] Scale back build matrix This matrix takes forever to build and makes the CI setup more complicated with various stack yamls fixing versions. I think it is reasonable to test the last 3 LTS and nightly. --- .travis.yml | 15 +++++++-------- stack.yaml | 7 +++++++ stack_lts-2.yaml | 31 ------------------------------- stack_lts-7.yaml | 30 ------------------------------ stack_lts-8.yaml | 29 ----------------------------- stack_nightly.yaml | 29 ----------------------------- 6 files changed, 14 insertions(+), 127 deletions(-) delete mode 100644 stack_lts-2.yaml delete mode 100644 stack_lts-7.yaml delete mode 100644 stack_lts-8.yaml delete mode 100644 stack_nightly.yaml diff --git a/.travis.yml b/.travis.yml index 1002986..05d6c3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ # and taking the idea of using cabal-meta from yesodweb/yesod. sudo: false +dist: trusty +language: c services: - redis-server @@ -23,14 +25,11 @@ cache: matrix: include: - - env: STACKARGS="--stack-yaml=stack_lts-2.yaml" - - env: STACKARGS="--resolver=lts-3" - - env: STACKARGS="--resolver=lts-4" - - env: STACKARGS="--resolver=lts-5" - - env: STACKARGS="--resolver=lts-6" - - env: STACKARGS="--stack-yaml=stack_lts-7.yaml" - - env: STACKARGS="--stack-yaml=stack_lts-8.yaml" - - env: STACKARGS="--stack-yaml=stack_nightly.yaml" + # last 3 LTS and nightly + - env: STACKARGS="--resolver=lts-8" + - env: STACKARGS="--resolver=lts-9" + - env: STACKARGS="--resolver=lts-10" + - env: STACKARGS="--resolver=nightly" before_install: # Download and unpack the stack executable diff --git a/stack.yaml b/stack.yaml index 61c9d38..4b9760e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -24,7 +24,14 @@ flags: serversession-frontend-yesod: lib-Werror: true extra-deps: + # for lts 9, 10 - acid-state-0.14.3 - snap-1.1.0.0 + - snap-core-1.0.3.1 + - snap-server-1.0.3.3 - heist-1.0.1.2 - map-syntax-0.2.0.2 + - xmlhtml-0.2.5.2 + # for lts-8 + - blaze-html-0.9.0.1 + - blaze-markup-0.8.2.0 diff --git a/stack_lts-2.yaml b/stack_lts-2.yaml deleted file mode 100644 index 9a06d45..0000000 --- a/stack_lts-2.yaml +++ /dev/null @@ -1,31 +0,0 @@ -resolver: lts-2.22 -packages: - - serversession - - serversession-backend-acid-state - - serversession-backend-persistent - - serversession-backend-redis - - serversession-frontend-snap - - serversession-frontend-wai - - serversession-frontend-yesod - - examples/serversession-example-yesod-persistent -flags: - serversession: - lib-Werror: true - serversession-backend-acid-state: - lib-Werror: true - serversession-backend-persistent: - lib-Werror: true - serversession-backend-redis: - lib-Werror: true - old-locale: true - serversession-frontend-snap: - lib-Werror: true - serversession-frontend-wai: - lib-Werror: true - serversession-frontend-yesod: - lib-Werror: true -extra-deps: - - acid-state-0.14.0 - - nonce-1.0.2 - - wai-session-0.3.2 - - hedis-0.6.6 diff --git a/stack_lts-7.yaml b/stack_lts-7.yaml deleted file mode 100644 index b7b9f87..0000000 --- a/stack_lts-7.yaml +++ /dev/null @@ -1,30 +0,0 @@ -resolver: lts-7.19 -packages: - - serversession - - serversession-backend-acid-state - - serversession-backend-persistent - - serversession-backend-redis - - serversession-frontend-snap - - serversession-frontend-wai - - serversession-frontend-yesod - - examples/serversession-example-yesod-persistent -flags: - serversession: - lib-Werror: true - serversession-backend-acid-state: - lib-Werror: true - serversession-backend-persistent: - lib-Werror: true - serversession-backend-redis: - lib-Werror: true - serversession-frontend-snap: - lib-Werror: true - serversession-frontend-wai: - lib-Werror: true - serversession-frontend-yesod: - lib-Werror: true -extra-deps: - - snap-1.0.0.1 - - heist-1.0.1.0 - - map-syntax-0.2.0.2 - - classy-prelude-yesod-1.1.0 diff --git a/stack_lts-8.yaml b/stack_lts-8.yaml deleted file mode 100644 index b13bfbe..0000000 --- a/stack_lts-8.yaml +++ /dev/null @@ -1,29 +0,0 @@ -resolver: lts-8.3 -packages: - - serversession - - serversession-backend-acid-state - - serversession-backend-persistent - - serversession-backend-redis - - serversession-frontend-snap - - serversession-frontend-wai - - serversession-frontend-yesod - - examples/serversession-example-yesod-persistent -flags: - serversession: - lib-Werror: true - serversession-backend-acid-state: - lib-Werror: true - serversession-backend-persistent: - lib-Werror: true - serversession-backend-redis: - lib-Werror: true - serversession-frontend-snap: - lib-Werror: true - serversession-frontend-wai: - lib-Werror: true - serversession-frontend-yesod: - lib-Werror: true -extra-deps: - - snap-1.0.0.1 - - heist-1.0.1.0 - - map-syntax-0.2.0.2 diff --git a/stack_nightly.yaml b/stack_nightly.yaml deleted file mode 100644 index ee4d268..0000000 --- a/stack_nightly.yaml +++ /dev/null @@ -1,29 +0,0 @@ -resolver: nightly-2017-02-02 -packages: - - serversession - - serversession-backend-acid-state - - serversession-backend-persistent - - serversession-backend-redis - - serversession-frontend-snap - - serversession-frontend-wai - - serversession-frontend-yesod - - examples/serversession-example-yesod-persistent -flags: - serversession: - lib-Werror: true - serversession-backend-acid-state: - lib-Werror: true - serversession-backend-persistent: - lib-Werror: true - serversession-backend-redis: - lib-Werror: true - serversession-frontend-snap: - lib-Werror: true - serversession-frontend-wai: - lib-Werror: true - serversession-frontend-yesod: - lib-Werror: true -extra-deps: - - snap-1.0.0.1 - - heist-1.0.1.0 - - map-syntax-0.2.0.2