From 68d51771c0bc506bf893a842fab6e2d1982077e7 Mon Sep 17 00:00:00 2001 From: Masahiro Sakai Date: Sat, 27 Feb 2021 13:55:42 +0900 Subject: [PATCH] update stackage versions --- .github/workflows/build.yaml | 26 +++++++++++++++++--------- .travis.yml | 10 +++++----- stack-ghc-8.10.yaml | 2 +- stack-ghc-8.8.yaml | 2 +- stack.yaml | 2 +- 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5c73378..ab844af 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,31 +9,39 @@ jobs: strategy: matrix: include: - - ghc: '8.8.4' + - ghc: '8.10.4' os: ubuntu-latest - stack_yaml: 'stack-ghc-8.8.yaml' + stack_yaml: 'stack-ghc-8.10.yaml' stack_args: '--coverage --haddock --no-haddock-deps' stack_test_args: '' flags: '--flag MIP:TestCBC --flag MIP:TestGlpsol --flag MIP:TestLPSolve --flag MIP:TestGurobiCl --flag MIP:TestSCIP' coveralls: true scip_docker: true - - ghc: '8.8.4' + - ghc: '8.10.4' os: ubuntu-latest - stack_yaml: 'stack-ghc-8.8.yaml' + stack_yaml: 'stack-ghc-8.10.yaml' stack_args: '' stack_test_args: '' flags: '--flag MIP:TestCBC --flag MIP:TestGlpsol --flag MIP:TestLPSolve --flag MIP:TestGurobiCl --flag MIP:-WithZLIB' coveralls: false - ghc: '8.8.4' - os: macos-latest + os: ubuntu-latest stack_yaml: 'stack-ghc-8.8.yaml' + stack_args: '--coverage --haddock --no-haddock-deps' + stack_test_args: '' + flags: '--flag MIP:TestCBC --flag MIP:TestGlpsol --flag MIP:TestLPSolve --flag MIP:TestGurobiCl' + + - ghc: '8.10.4' + os: macos-latest + stack_yaml: 'stack-ghc-8.10.yaml' stack_args: '' stack_test_args: '' flags: '--flag MIP:TestCBC --flag MIP:TestGlpsol --flag MIP:TestLPSolve --flag MIP:TestGurobiCl' coveralls: false - - ghc: '8.8.4' + + - ghc: '8.10.4' os: windows-latest - stack_yaml: 'stack-ghc-8.8.yaml' + stack_yaml: 'stack-ghc-8.10.yaml' stack_args: '--arch x86_64' stack_test_args: '-j1' # https://github.com/commercialhaskell/stack/issues/5024 flags: '--flag MIP:TestCBC --flag MIP:TestGlpsol --flag MIP:TestLPSolve --flag MIP:TestGurobiCl' @@ -49,9 +57,9 @@ jobs: coveralls: false windows_32_or_64: '32' MINGW_PACKAGE_PREFIX: '' - - ghc: '8.8.4' + - ghc: '8.10.4' os: windows-latest - stack_yaml: 'stack-ghc-8.8.yaml' + stack_yaml: 'stack-ghc-8.10.yaml' stack_args: '--arch x86_64' stack_test_args: '-j1' # https://github.com/commercialhaskell/stack/issues/5024 flags: '--flag MIP:TestGlpsol --flag MIP:TestLPSolve' diff --git a/.travis.yml b/.travis.yml index 6da739b..02864eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,11 +33,11 @@ addons: matrix: include: - - env: STACK_YAML=stack-ghc-8.10.yaml - compiler: ": #GHC 8.10.1" - - env: STACK_YAML=stack-ghc-8.8.yaml HADDOCK=1 SHC_GHCVER=8.0.1 - compiler: ": #GHC 8.8.4" - - env: STACK_YAML=stack-ghc-8.8.yaml NOZLIB=1 + - env: STACK_YAML=stack-ghc-8.10.yaml HADDOCK=1 SHC_GHCVER=8.0.1 + compiler: ": #GHC 8.10.4" + - env: STACK_YAML=stack-ghc-8.10.yaml NOZLIB=1 + compiler: ": #GHC 8.10.4" + - env: STACK_YAML=stack-ghc-8.8.yaml compiler: ": #GHC 8.8.4" - env: STACK_YAML=stack-ghc-8.8.yaml compiler: ": #GHC 8.8.4" diff --git a/stack-ghc-8.10.yaml b/stack-ghc-8.10.yaml index 3cfa51c..bdb7972 100644 --- a/stack-ghc-8.10.yaml +++ b/stack-ghc-8.10.yaml @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: nightly-2020-11-01 +resolver: lts-17.4 # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/stack-ghc-8.8.yaml b/stack-ghc-8.8.yaml index 3843c80..a247503 100644 --- a/stack-ghc-8.8.yaml +++ b/stack-ghc-8.8.yaml @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-16.20 +resolver: lts-16.31 # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/stack.yaml b/stack.yaml index 3843c80..bdb7972 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-16.20 +resolver: lts-17.4 # User packages to be built. # Various formats can be used as shown in the example below.