From 4b9584dbe46a8c39a9cb62e89a003aa9470f4104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Ch=C3=A9ron?= Date: Mon, 24 Feb 2020 06:53:19 +0100 Subject: [PATCH] Use lts-15 in CI and bump versions --- .appveyor.yml | 6 +++--- .haskell-ci | 4 ++-- .travis.yml | 6 +++--- cryptonite.cabal | 2 +- stack.yaml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index d9a861c..5d4d90f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -# ~*~ auto-generated by haskell-ci with config : 90eae0e303541787a1c5382ef6f8198d8e3790ba5dd37a50c4def1fcd3995311 ~*~ +# ~*~ auto-generated by haskell-ci with config : df7ce7fce63ae2c16030178e7df265c57b9650106ac97ee31118dbf14ddbd2ba ~*~ version: "{build}" clone_folder: C:\project @@ -10,8 +10,8 @@ environment: global: STACK_ROOT: "C:\\SR" matrix: - - { BUILD: "ghc-8.6", STACKCMD: "stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps", STACKCFG: "{ resolver: lts-14.7, packages: [ '.' ], extra-deps: [], flags: {} }", STACKURL: "https://www.stackage.org/stack/windows-x86_64" } - - { BUILD: "ghc-8.8", STACKCMD: "stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps", STACKCFG: "{ resolver: nightly-2019-10-05, packages: [ '.' ], extra-deps: [], flags: {} }", STACKURL: "https://www.stackage.org/stack/windows-x86_64" } + - { BUILD: "ghc-8.6", STACKCMD: "stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps", STACKCFG: "{ resolver: lts-14.27, packages: [ '.' ], extra-deps: [], flags: {} }", STACKURL: "https://www.stackage.org/stack/windows-x86_64" } + - { BUILD: "ghc-8.8", STACKCMD: "stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps", STACKCFG: "{ resolver: lts-15.1, packages: [ '.' ], extra-deps: [], flags: {} }", STACKURL: "https://www.stackage.org/stack/windows-x86_64" } matrix: fast_finish: true diff --git a/.haskell-ci b/.haskell-ci index df2b845..b3ddbda 100644 --- a/.haskell-ci +++ b/.haskell-ci @@ -2,8 +2,8 @@ compiler: ghc-8.0 lts-9.21 compiler: ghc-8.2 lts-11.22 compiler: ghc-8.4 lts-12.26 -compiler: ghc-8.6 lts-14.7 -compiler: ghc-8.8 nightly-2019-10-05 +compiler: ghc-8.6 lts-14.27 +compiler: ghc-8.8 lts-15.1 # options # option: alias x=y z=v diff --git a/.travis.yml b/.travis.yml index 26dd1cf..1f24739 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# ~*~ auto-generated by haskell-ci with config : 90eae0e303541787a1c5382ef6f8198d8e3790ba5dd37a50c4def1fcd3995311 ~*~ +# ~*~ auto-generated by haskell-ci with config : df7ce7fce63ae2c16030178e7df265c57b9650106ac97ee31118dbf14ddbd2ba ~*~ # Use new container infrastructure to enable caching sudo: false @@ -62,11 +62,11 @@ script: stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps ;; ghc-8.6) - echo "{ resolver: lts-14.7, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml + echo "{ resolver: lts-14.27, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps ;; ghc-8.8) - echo "{ resolver: nightly-2019-10-05, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml + echo "{ resolver: lts-15.1, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps ;; esac diff --git a/cryptonite.cabal b/cryptonite.cabal index c7e5742..31bd64f 100644 --- a/cryptonite.cabal +++ b/cryptonite.cabal @@ -36,7 +36,7 @@ Build-Type: Simple Homepage: https://github.com/haskell-crypto/cryptonite Bug-reports: https://github.com/haskell-crypto/cryptonite/issues Cabal-Version: 1.18 -tested-with: GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2 +tested-with: GHC==8.8.2, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2 extra-doc-files: README.md CHANGELOG.md extra-source-files: cbits/*.h cbits/aes/*.h diff --git a/stack.yaml b/stack.yaml index 02adde4..e18363e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,3 +1,3 @@ -# ~*~ auto-generated by haskell-ci with config : 90eae0e303541787a1c5382ef6f8198d8e3790ba5dd37a50c4def1fcd3995311 ~*~ -{ resolver: lts-14.7, packages: [ '.' ], extra-deps: [], flags: {} } +# ~*~ auto-generated by haskell-ci with config : df7ce7fce63ae2c16030178e7df265c57b9650106ac97ee31118dbf14ddbd2ba ~*~ +{ resolver: lts-14.27, packages: [ '.' ], extra-deps: [], flags: {} }