From 1d0d1dc6644f7358b62ea8ce40995ca321e17c86 Mon Sep 17 00:00:00 2001 From: Masahiro Sakai Date: Wed, 10 Feb 2021 20:33:20 +0900 Subject: [PATCH] stop supporting GHC 8.0, 8.2, and 8.4 --- .github/workflows/build.yaml | 18 -------- .travis.yml | 6 --- stack-ghc-8.0.yaml | 86 ------------------------------------ stack-ghc-8.2.yaml | 84 ----------------------------------- stack-ghc-8.4.yaml | 85 ----------------------------------- toysolver.cabal | 3 -- 6 files changed, 282 deletions(-) delete mode 100644 stack-ghc-8.0.yaml delete mode 100644 stack-ghc-8.2.yaml delete mode 100644 stack-ghc-8.4.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2279f43c..84844c4e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -48,24 +48,6 @@ jobs: stack_args: '' flags: '--flag toysolver:BuildToyFMF --flag toysolver:BuildSamplePrograms --flag toysolver:BuildMiscPrograms --flag toysolver:OpenCL' coveralls: false - - ghc: '8.4.4' - os: ubuntu-latest - stack_yaml: 'stack-ghc-8.4.yaml' - stack_args: '' - flags: '--flag toysolver:BuildToyFMF --flag toysolver:BuildSamplePrograms --flag toysolver:BuildMiscPrograms --flag toysolver:OpenCL' - coveralls: false - - ghc: '8.2.2' - os: ubuntu-latest - stack_yaml: 'stack-ghc-8.2.yaml' - stack_args: '' - flags: '--flag toysolver:BuildToyFMF --flag toysolver:BuildSamplePrograms --flag toysolver:BuildMiscPrograms --flag toysolver:OpenCL' - coveralls: false - - ghc: '8.0.2' - os: ubuntu-latest - stack_yaml: 'stack-ghc-8.0.yaml' - stack_args: '' - flags: '--flag toysolver:BuildToyFMF --flag toysolver:BuildSamplePrograms --flag toysolver:BuildMiscPrograms --flag toysolver:OpenCL' - coveralls: false steps: - uses: actions/checkout@v2 with: diff --git a/.travis.yml b/.travis.yml index 807e848a..aeef8b3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,12 +34,6 @@ matrix: # compiler: ": #GHC 8.8.4" #- env: STACK_YAML=stack-ghc-8.6.yaml # compiler: ": #GHC 8.6.5" - #- env: STACK_YAML=stack-ghc-8.4.yaml - # compiler: ": #GHC 8.4.4" - #- env: STACK_YAML=stack-ghc-8.2.yaml - # compiler: ": #GHC 8.2.2" - #- env: STACK_YAML=stack-ghc-8.0.yaml - # compiler: ": #GHC 8.0.2" # Caching so the next build will be fast too. cache: diff --git a/stack-ghc-8.0.yaml b/stack-ghc-8.0.yaml deleted file mode 100644 index 975ad84a..00000000 --- a/stack-ghc-8.0.yaml +++ /dev/null @@ -1,86 +0,0 @@ -# This file was automatically generated by 'stack init' -# -# Some commonly used options have been documented as comments in this file. -# For advanced use and comprehensive documentation of the format, please see: -# http://docs.haskellstack.org/en/stable/yaml_configuration/ - -# Resolver to choose a 'specific' stackage snapshot or a compiler version. -# A snapshot resolver dictates the compiler version and the set of packages -# to be used for project dependencies. For example: -# -# resolver: lts-3.5 -# resolver: nightly-2015-09-21 -# resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-9.21 - -# User packages to be built. -# Various formats can be used as shown in the example below. -# -# packages: -# - some-directory -# - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. -packages: -- . - -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -extra-deps: -- Cabal-2.0.1.1 -- intern-0.9.1.4 -- queue-0.1.2 -- OptDir-0.0.3 -- logic-TPTP-0.4.7.0 -- data-interval-2.0.1 -- extended-reals-0.2.3.0 -- finite-field-0.9.0 -- pseudo-boolean-0.1.9.0@sha256:18be9ef79c2b81baa746672182afefd800f8b96fcac7946bbb0456ea652e0a74 -- sign-0.4.4 -- OpenCL-1.0.3.4 -# - git: https://github.com/msakai/opencl.git -# commit: 80d0cb9d235819cd53e6a36d7a9258bc19d564ab -- bytestring-encoding-0.1.0.0 -- MIP-0.1.1.0 - -# hack for avoiding haddock error of MemoTrie-0.6.4 -#- MemoTrie-0.6.7 -#- newtype-generics-0.5 - -# Override default flag values for local packages and extra-deps -flags: {} - -# Extra package databases containing global packages -extra-package-dbs: [] - -# Control whether we use the GHC we find on the path -# system-ghc: true -# -# Require a specific version of stack, using version ranges -# require-stack-version: -any # Default -# require-stack-version: ">=1.1" -# -# Override the architecture used by stack, especially useful on Windows -# arch: i386 -# arch: x86_64 -# -# Extra directories used by stack for building -# extra-include-dirs: [/path/to/dir] -# extra-lib-dirs: [/path/to/dir] -# -# Allow a newer minor version of GHC than the snapshot specifies -# compiler-check: newer-minor diff --git a/stack-ghc-8.2.yaml b/stack-ghc-8.2.yaml deleted file mode 100644 index 8b51028b..00000000 --- a/stack-ghc-8.2.yaml +++ /dev/null @@ -1,84 +0,0 @@ -# This file was automatically generated by 'stack init' -# -# Some commonly used options have been documented as comments in this file. -# For advanced use and comprehensive documentation of the format, please see: -# http://docs.haskellstack.org/en/stable/yaml_configuration/ - -# Resolver to choose a 'specific' stackage snapshot or a compiler version. -# A snapshot resolver dictates the compiler version and the set of packages -# to be used for project dependencies. For example: -# -# resolver: lts-3.5 -# resolver: nightly-2015-09-21 -# resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-11.22 - -# User packages to be built. -# Various formats can be used as shown in the example below. -# -# packages: -# - some-directory -# - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. -packages: -- . - -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -extra-deps: -- queue-0.1.2 -- OptDir-0.0.3 -- logic-TPTP-0.4.7.0 -- data-interval-2.0.1 -- extended-reals-0.2.3.0 -- finite-field-0.9.0 -- pseudo-boolean-0.1.9.0@sha256:18be9ef79c2b81baa746672182afefd800f8b96fcac7946bbb0456ea652e0a74 -- sign-0.4.4 -- OpenCL-1.0.3.4 -# - git: https://github.com/msakai/opencl.git -# commit: 80d0cb9d235819cd53e6a36d7a9258bc19d564ab -- bytestring-encoding-0.1.0.0 -- MIP-0.1.1.0 - -# hack for avoiding haddock error of MemoTrie-0.6.4 -#- MemoTrie-0.6.7 -#- newtype-generics-0.5 - -# Override default flag values for local packages and extra-deps -flags: {} - -# Extra package databases containing global packages -extra-package-dbs: [] - -# Control whether we use the GHC we find on the path -# system-ghc: true -# -# Require a specific version of stack, using version ranges -# require-stack-version: -any # Default -# require-stack-version: ">=1.1" -# -# Override the architecture used by stack, especially useful on Windows -# arch: i386 -# arch: x86_64 -# -# Extra directories used by stack for building -# extra-include-dirs: [/path/to/dir] -# extra-lib-dirs: [/path/to/dir] -# -# Allow a newer minor version of GHC than the snapshot specifies -# compiler-check: newer-minor diff --git a/stack-ghc-8.4.yaml b/stack-ghc-8.4.yaml deleted file mode 100644 index 23fc6423..00000000 --- a/stack-ghc-8.4.yaml +++ /dev/null @@ -1,85 +0,0 @@ -# This file was automatically generated by 'stack init' -# -# Some commonly used options have been documented as comments in this file. -# For advanced use and comprehensive documentation of the format, please see: -# http://docs.haskellstack.org/en/stable/yaml_configuration/ - -# Resolver to choose a 'specific' stackage snapshot or a compiler version. -# A snapshot resolver dictates the compiler version and the set of packages -# to be used for project dependencies. For example: -# -# resolver: lts-3.5 -# resolver: nightly-2015-09-21 -# resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-12.26 - -# User packages to be built. -# Various formats can be used as shown in the example below. -# -# packages: -# - some-directory -# - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. -packages: -- . - -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -extra-deps: -- multiset-0.3.4.3@sha256:968192524bd38ffa29856e1e3f9f6f8a5704f98899d4b25f8ebd425001594f61,1790 -- queue-0.1.2 -- OptDir-0.0.3 -- logic-TPTP-0.4.7.0 -- data-interval-2.0.1 -- extended-reals-0.2.3.0 -- finite-field-0.9.0 -- pseudo-boolean-0.1.9.0@sha256:18be9ef79c2b81baa746672182afefd800f8b96fcac7946bbb0456ea652e0a74 -- sign-0.4.4 -- OpenCL-1.0.3.4 -# - git: https://github.com/msakai/opencl.git -# commit: 80d0cb9d235819cd53e6a36d7a9258bc19d564ab -- bytestring-encoding-0.1.0.0 -- MIP-0.1.1.0 - -# hack for avoiding haddock error of MemoTrie-0.6.4 -#- MemoTrie-0.6.7 -#- newtype-generics-0.5 - -# Override default flag values for local packages and extra-deps -flags: {} - -# Extra package databases containing global packages -extra-package-dbs: [] - -# Control whether we use the GHC we find on the path -# system-ghc: true -# -# Require a specific version of stack, using version ranges -# require-stack-version: -any # Default -# require-stack-version: ">=1.1" -# -# Override the architecture used by stack, especially useful on Windows -# arch: i386 -# arch: x86_64 -# -# Extra directories used by stack for building -# extra-include-dirs: [/path/to/dir] -# extra-lib-dirs: [/path/to/dir] -# -# Allow a newer minor version of GHC than the snapshot specifies -# compiler-check: newer-minor diff --git a/toysolver.cabal b/toysolver.cabal index 1c0f16d7..85fe3fd4 100644 --- a/toysolver.cabal +++ b/toysolver.cabal @@ -11,9 +11,6 @@ Description: Toy-level solver implementation of various problems including SAT, Homepage: https://github.com/msakai/toysolver/ Bug-Reports: https://github.com/msakai/toysolver/issues Tested-With: - GHC ==8.0.2 - GHC ==8.2.2 - GHC ==8.4.4 GHC ==8.6.5 GHC ==8.8.4 GHC ==8.10.2