From e56308f9d0a98eec38e1bffcaf353c2fb338bca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Ch=C3=A9ron?= Date: Sun, 8 Mar 2020 18:33:37 +0100 Subject: [PATCH] Fix ignored allow_failures and weeder build in Travis CI Used haskell-ci commit cbf9d90 from PR vincenthz/haskell-ci#5 to regenerate the files. --- .appveyor.yml | 2 +- .haskell-ci | 2 +- .travis.yml | 44 ++++++++++++++++++++++---------------------- stack.yaml | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 5d4d90f..171240e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -# ~*~ auto-generated by haskell-ci with config : df7ce7fce63ae2c16030178e7df265c57b9650106ac97ee31118dbf14ddbd2ba ~*~ +# ~*~ auto-generated by haskell-ci with config : 4fdddfa41dd039e198b8d125a70471f7dd140fa01001d99126af56fb31429ece ~*~ version: "{build}" clone_folder: C:\project diff --git a/.haskell-ci b/.haskell-ci index b3ddbda..9abc447 100644 --- a/.haskell-ci +++ b/.haskell-ci @@ -11,8 +11,8 @@ option: gaugedeps extradep=gauge-0.2.1 option: basementmin extradep=basement-0.0.8 extradep=memory-0.14.18 # builds -build: ghc-8.2 basementmin build: ghc-8.0 basementmin gaugedeps +build: ghc-8.2 basementmin build: ghc-8.4 build: ghc-8.6 os=linux,osx,windows build: ghc-8.8 os=linux,windows diff --git a/.travis.yml b/.travis.yml index 1f24739..af9c053 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,4 @@ -# ~*~ auto-generated by haskell-ci with config : df7ce7fce63ae2c16030178e7df265c57b9650106ac97ee31118dbf14ddbd2ba ~*~ - -# Use new container infrastructure to enable caching -sudo: false +# ~*~ auto-generated by haskell-ci with config : 4fdddfa41dd039e198b8d125a70471f7dd140fa01001d99126af56fb31429ece ~*~ # Caching so the next build will be fast too. cache: @@ -10,29 +7,32 @@ cache: - $HOME/.stack - $HOME/.local -matrix: +language: generic +os: linux + +jobs: include: - - { env: BUILD=stack RESOLVER=ghc-8.2, compiler: ghc-8.2, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } } - - { env: BUILD=stack RESOLVER=ghc-8.0, compiler: ghc-8.0, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } } - - { env: BUILD=stack RESOLVER=ghc-8.4, compiler: ghc-8.4, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } } - - { env: BUILD=stack RESOLVER=ghc-8.6, compiler: ghc-8.6, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } } - - { env: BUILD=stack RESOLVER=ghc-8.6, compiler: ghc-8.6, language: generic, addons: { apt: { packages: [ libgmp-dev ] } }, os: osx } - - { env: BUILD=stack RESOLVER=ghc-8.8, compiler: ghc-8.8, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } } - - { env: BUILD=hlint, compiler: hlint, language: generic } - - { env: BUILD=weeder, compiler: weeder, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } } + - { env: BUILD=stack RESOLVER=ghc-8.0, addons: { apt: { packages: [ libgmp-dev ] } } } + - { env: BUILD=stack RESOLVER=ghc-8.2, addons: { apt: { packages: [ libgmp-dev ] } } } + - { env: BUILD=stack RESOLVER=ghc-8.4, addons: { apt: { packages: [ libgmp-dev ] } } } + - { env: BUILD=stack RESOLVER=ghc-8.6, addons: { apt: { packages: [ libgmp-dev ] } } } + - { env: BUILD=stack RESOLVER=ghc-8.6, addons: { apt: { packages: [ libgmp-dev ] } }, os: osx } + - { env: BUILD=stack RESOLVER=ghc-8.8, addons: { apt: { packages: [ libgmp-dev ] } } } + - { env: BUILD=hlint } + - { env: BUILD=weeder, addons: { apt: { packages: [ libgmp-dev ] } } } allow_failures: - - { env: BUILD=hlint, compiler: hlint, language: generic } - - { env: BUILD=weeder, compiler: weeder, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } } + - { env: BUILD=hlint } + - { env: BUILD=weeder, addons: { apt: { packages: [ libgmp-dev ] } } } install: - - export PATH=$HOME/.local/bin::$HOME/.cabal/bin:$PATH + - export PATH=$HOME/.local/bin:$HOME/.cabal/bin:$PATH - mkdir -p ~/.local/bin - | case "$BUILD" in stack|weeder) if [ `uname` = "Darwin" ] then - travis_retry curl --insecure -L https://www.stackage.org/stack/osx-x86_64 | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin + travis_retry curl -L https://www.stackage.org/stack/osx-x86_64 | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin else travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' fi @@ -49,14 +49,14 @@ script: stack) # create the build stack.yaml case "$RESOLVER" in - ghc-8.2) - echo "{ resolver: lts-11.22, packages: [ '.' ], extra-deps: [ basement-0.0.8, memory-0.14.18 ], flags: {} }" > stack.yaml - stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps - ;; ghc-8.0) echo "{ resolver: lts-9.21, packages: [ '.' ], extra-deps: [ basement-0.0.8, memory-0.14.18, gauge-0.2.1 ], flags: {} }" > stack.yaml stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps ;; + ghc-8.2) + echo "{ resolver: lts-11.22, packages: [ '.' ], extra-deps: [ basement-0.0.8, memory-0.14.18 ], flags: {} }" > stack.yaml + stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps + ;; ghc-8.4) echo "{ resolver: lts-12.26, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps @@ -75,7 +75,7 @@ script: curl -sL https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh | sh -s . --cpp-define=__GLASGOW_HASKELL__=800 --cpp-define=x86_64_HOST_ARCH=1 --cpp-define=mingw32_HOST_OS=1 ;; weeder) - stack --no-terminal build --install-ghc + stack --no-terminal build --install-ghc --ghc-options="-ddump-to-file -ddump-hi" --test --no-run-tests --bench --no-run-benchmarks curl -sL https://raw.github.com/ndmitchell/weeder/master/misc/travis.sh | sh -s . ;; esac diff --git a/stack.yaml b/stack.yaml index e18363e..0353574 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,3 +1,3 @@ -# ~*~ auto-generated by haskell-ci with config : df7ce7fce63ae2c16030178e7df265c57b9650106ac97ee31118dbf14ddbd2ba ~*~ +# ~*~ auto-generated by haskell-ci with config : 4fdddfa41dd039e198b8d125a70471f7dd140fa01001d99126af56fb31429ece ~*~ { resolver: lts-14.27, packages: [ '.' ], extra-deps: [], flags: {} }