Skip to content

Commit

Permalink
Merge pull request #177 from tfausak/ghc-8-10-3
Browse files Browse the repository at this point in the history
Upgrade to GHC 8.10.3
  • Loading branch information
tfausak authored Jan 17, 2021
2 parents a9eb847 + 1f7768d commit 5273cfd
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 22 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@ jobs:
strategy:
matrix:
include:
- { os: ubuntu-18.04, ghc: 8.10.2, cabal: 3.2.0.0, primary: true, latest: true, extension: '' }
- { os: ubuntu-18.04, ghc: 8.8.4, cabal: 3.2.0.0, primary: false, latest: false, extension: '' }
- { os: ubuntu-18.04, ghc: 8.6.5, cabal: 3.2.0.0, primary: false, latest: false, extension: '' }
- { os: macos-10.15, ghc: 8.10.2, cabal: 3.2.0.0, primary: false, latest: true, extension: '' }
- { os: windows-2019, ghc: 8.8.4, cabal: 3.2.0.0, primary: false, latest: true, extension: '.exe' }
name: ${{ matrix.os }} ghc-${{ matrix.ghc }}
- { os: ubuntu-18.04, ghc: 8.10.3, cabal: 3.2.0.0, primary: true, extension: '' }
- { os: macos-10.15, ghc: 8.10.3, cabal: 3.2.0.0, primary: false, extension: '' }
- { os: windows-2019, ghc: 8.10.3, cabal: 3.2.0.0, primary: false, extension: '.exe' }
name: ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:

Expand Down Expand Up @@ -62,7 +60,7 @@ jobs:
- if: github.event_name == 'release' && matrix.primary
run: cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' docker/rattletrap-*.tar.gz

- if: github.event_name == 'release' && matrix.latest
- if: github.event_name == 'release'
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
25 changes: 11 additions & 14 deletions rattletrap.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,27 @@ flag static
library
autogen-modules: Paths_rattletrap
build-depends:
base >= 4.12.0 && < 4.15
, aeson >= 1.3.1 && < 1.6
, aeson-pretty >= 0.8.7 && < 0.9
, binary >= 0.8.5 && < 0.9
, bytestring >= 0.10.8 && < 0.11
base >= 4.14.1 && < 4.15
, aeson >= 1.5.5 && < 1.6
, aeson-pretty >= 0.8.8 && < 0.9
, binary >= 0.8.8 && < 0.9
, bytestring >= 0.10.12 && < 0.11
, caerbannog >= 0.6.0 && < 0.7
, containers >= 0.5.11&& < 0.7
, containers >= 0.6.2 && < 0.7
, filepath >= 1.4.2 && < 1.5
, http-client >= 0.5.13 && < 0.8
, http-client >= 0.6.4 && < 0.8
, http-client-tls >= 0.3.5 && < 0.4
, scientific >= 0.3.6 && < 0.4
, template-haskell >= 2.13.0 && < 2.17
, text >= 1.2.3 && < 1.3
, transformers >= 0.5.5 && < 0.6
, template-haskell >= 2.16.0 && < 2.17
, text >= 1.2.4 && < 1.3
, transformers >= 0.5.6 && < 0.6
default-language: Haskell2010
exposed-modules: Rattletrap
ghc-options:
-Weverything
-Wno-all-missed-specialisations
-Wno-implicit-prelude
-Wno-missing-deriving-strategies
-Wno-missing-exported-signatures
-Wno-missing-import-lists
-Wno-safe
Expand Down Expand Up @@ -289,10 +290,6 @@ library
Rattletrap.Utility.Crc
Rattletrap.Utility.Helper

if impl(ghc >= 8.8)
ghc-options:
-Wno-missing-deriving-strategies

if impl(ghc >= 8.10)
ghc-options:
-Wno-missing-safe-haskell-mode
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
resolver: lts-16.26
resolver: nightly-2021-01-17
extra-deps:
- caerbannog-0.6.0.3

0 comments on commit 5273cfd

Please sign in to comment.