Skip to content

Commit dba56a7

Browse files
committed
upgrade to latest GHC version
1 parent f04b0c8 commit dba56a7

8 files changed

+11
-136
lines changed

.github/workflows/haskell.yml

+4-7
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,23 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
include:
26-
- os: macos-latest
2726
- os: ubuntu-latest
28-
- os: windows-latest
2927

3028
steps:
3129

3230
# setup:
3331

3432
- name: Check out
35-
uses: actions/checkout@v2
33+
uses: actions/checkout@v4
3634

3735

3836
- name: Setup Haskell
3937
id: setup-haskell-cabal
40-
uses: haskell/actions/setup@v1
38+
uses: haskell-actions/setup@v2
4139
with:
42-
ghc-version: '8.10'
43-
enable-stack: true
40+
ghc-version: '9.8'
4441

4542
# actions
4643

4744
- name: Test
48-
run: stack test
45+
run: cabal test --test-show-details=always

.github/workflows/hlint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
HLINT_ACTION_LOG_LEVEL: debug
2121
steps:
2222
- name: Check out
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
2424

2525
- name: Set up HLint
2626
uses: rwe/actions-hlint-setup@v1

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*.hi
22
*.o
33
.stack-work
4+
dist-newstyle

language-docker.cabal

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
cabal-version: 1.12
2-
3-
-- This file has been generated from package.yaml by hpack version 0.36.0.
4-
--
5-
-- see: https://github.com/sol/hpack
6-
--
7-
-- hash: 528820a99687ed9372038487df42e487d63b867ed312d39e8e51b6d1bf4cf7d9
1+
cabal-version: 2.0
82

93
name: language-docker
10-
version: 12.2.0
4+
version: 13.0.0
115
synopsis: Dockerfile parser, pretty-printer and embedded DSL
126
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.
137
See the <https://github.com/hadolint/language-docker GitHub project> for the source-code and examples.
@@ -83,7 +77,7 @@ library
8377
, split >=0.2
8478
, text
8579
, time
86-
default-language: Haskell2010
80+
default-language: GHC2021
8781

8882
test-suite hspec
8983
type: exitcode-stdio-1.0
@@ -125,4 +119,5 @@ test-suite hspec
125119
, split >=0.2
126120
, text
127121
, time
128-
default-language: Haskell2010
122+
default-language: GHC2021
123+
build-tool-depends: hspec-discover:hspec-discover == 2.*

package.yaml

-84
This file was deleted.

stack-gh-pages

-15
This file was deleted.

stack.yaml

-7
This file was deleted.

stack.yaml.lock

-12
This file was deleted.

0 commit comments

Comments
 (0)