upgrade to latest GHC version

hadolint · Apr 24, 2024 · dba56a7 · dba56a7
1 parent f04b0c8
commit dba56a7
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 136 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -23,26 +23,23 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - os: macos-latest
         - os: ubuntu-latest
-        - os: windows-latest
 
     steps:
 
     # setup:
 
     - name: Check out
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
 
     - name: Setup Haskell
       id: setup-haskell-cabal
-      uses: haskell/actions/setup@v1
+      uses: haskell-actions/setup@v2
       with:
-          ghc-version: '8.10'
-          enable-stack: true
+          ghc-version: '9.8'
 
     # actions
 
     - name: Test
-      run: stack test
+      run: cabal test --test-show-details=always
diff --git a/.github/workflows/hlint.yml b/.github/workflows/hlint.yml
@@ -20,7 +20,7 @@ jobs:
       HLINT_ACTION_LOG_LEVEL: debug
     steps:
       - name: Check out
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up HLint
         uses: rwe/actions-hlint-setup@v1

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 *.hi
 *.o
 .stack-work
+dist-newstyle
diff --git a/language-docker.cabal b/language-docker.cabal
@@ -1,13 +1,7 @@
-cabal-version: 1.12
-
--- This file has been generated from package.yaml by hpack version 0.36.0.
---
--- see: https://github.com/sol/hpack
---
--- hash: 528820a99687ed9372038487df42e487d63b867ed312d39e8e51b6d1bf4cf7d9
+cabal-version: 2.0
 
 name:           language-docker
-version:        12.2.0
+version:        13.0.0
 synopsis:       Dockerfile parser, pretty-printer and embedded DSL
 description:    All functions for parsing and pretty-printing Dockerfiles are exported through @Language.Docker@. For more fine-grained operations look for specific modules that implement a certain functionality.
                 See the <https://github.com/hadolint/language-docker GitHub project> for the source-code and examples.
@@ -83,7 +77,7 @@ library
     , split >=0.2
     , text
     , time
-  default-language: Haskell2010
+  default-language: GHC2021
 
 test-suite hspec
   type: exitcode-stdio-1.0
@@ -125,4 +119,5 @@ test-suite hspec
     , split >=0.2
     , text
     , time
-  default-language: Haskell2010
+  default-language: GHC2021
+  build-tool-depends: hspec-discover:hspec-discover == 2.*
diff --git a/package.yaml b/package.yaml
diff --git a/stack-gh-pages b/stack-gh-pages
diff --git a/stack.yaml b/stack.yaml
diff --git a/stack.yaml.lock b/stack.yaml.lock