Merge 68d5177 into 9a46bcb

msakai · Feb 27, 2021 · c233894 · c233894
2 parents 9a46bcb + 68d5177
commit c233894
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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.