Use an action to run hlint, get rid of hlint test-suite.

cabalism · Mar 28, 2022 · 75cbf68 · 75cbf68
1 parent 32af200
commit 75cbf68
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 67 deletions.
diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml
@@ -28,6 +28,11 @@ jobs:
         ghc-version: ${{ matrix.ghc }}
         cabal-version: ${{ matrix.cabal }}
 
+    - uses: rwe/actions-hlint-setup@v1
+      name: Set up HLint
+      with:
+        version: "3.3.6"
+
     - uses: actions/cache@v2
       name: cache ~/.cabal/store
       with:
@@ -36,11 +41,14 @@ jobs:
 
     - name: build
       run: |
-        cabal v2-update
-        cabal v2-build all --enable-tests
+        cabal update
+        cabal build all --enable-tests
 
     - name: test golden
-      run: cabal v2-test test:golden --test-show-details=direct --test-option="--color=always"
+      run: cabal test test:golden --test-show-details=direct --test-option="--color=always"
 
-    - name: test hlint
-      run: cabal v2-test test:hlint --test-show-details=direct --test-option="--color=always"
+    - uses: rwe/actions-hlint-run@v2
+      name: hlint
+      with:
+        path: '["library", "exe", "test-suite-golden/src"]'
+        fail-on: suggestion
diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
@@ -35,7 +35,4 @@ jobs:
       run: stack test --no-run-tests --no-terminal --stack-yaml=./stack/stack-${{ matrix.ghc }}.yaml
 
     - name: test golden
-      run: stack test hpack-dhall:golden --no-terminal --test-arguments "--color=always" --stack-yaml=./stack/stack-${{ matrix.ghc }}.yaml
-
-    - name: test hlint 
-      run: stack test hpack-dhall:hlint --no-terminal --test-arguments "--color=always" --stack-yaml=./stack/stack-${{ matrix.ghc }}.yaml
+      run: stack test hpack-dhall:golden --no-terminal --test-arguments "--color=always" --stack-yaml=./stack/stack-${{ matrix.ghc }}.yaml
diff --git a/default-tests.dhall b/default-tests.dhall
diff --git a/hpack-dhall.cabal b/hpack-dhall.cabal
@@ -27,7 +27,7 @@ license:        BSD3
 license-file:   LICENSE
 build-type:     Simple
 tested-with:
-    GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.1
+    GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.2
 extra-source-files:
     package.dhall
     changelog.md
@@ -298,33 +298,3 @@ test-suite golden
     , utf8-string
     , yaml
   default-language: Haskell2010
-
-test-suite hlint
-  type: exitcode-stdio-1.0
-  main-is: HLint.hs
-  other-modules:
-      Hpack.Dhall
-      Hpack.Fields
-      Paths_hpack_dhall
-  hs-source-dirs:
-      library
-      exe
-      test-suite-hlint
-  ghc-options: -Wall -Wincomplete-uni-patterns -Wcompat -Widentities -Wredundant-constraints -fhide-source-paths -rtsopts -threaded -with-rtsopts=-N
-  build-depends:
-      aeson
-    , aeson-pretty
-    , base >=4.13 && <5
-    , bytestring
-    , dhall >=1.41.1
-    , dhall-json >=1.7.10
-    , filepath
-    , hlint
-    , hpack >=0.34.7 && <0.35
-    , megaparsec >=9.2
-    , microlens
-    , prettyprinter
-    , text
-    , transformers
-    , yaml
-  default-language: Haskell2010
diff --git a/package.dhall b/package.dhall
@@ -41,7 +41,8 @@ in  let exe-deps = [ "optparse-applicative" ]
             and functions.
             ''
         , github = "cabalism/hpack-dhall"
-        , tested-with = "GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.2"
+        , tested-with =
+            "GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.2"
         , extra-source-files =
           [ "package.dhall"
           , "changelog.md"
@@ -85,19 +86,17 @@ in  let exe-deps = [ "optparse-applicative" ]
             , dependencies = exe-deps
             }
           }
-        , tests =
-              ./default-tests.dhall
-            ⫽ { golden =
-                { main = "Golden.hs"
-                , source-dirs = [ "test-suite-golden/src" ]
-                , dependencies =
-                  [ "Cabal"
-                  , "Diff"
-                  , "directory"
-                  , "tasty"
-                  , "tasty-golden"
-                  , "utf8-string"
-                  ]
-                }
-              }
+        , tests.golden
+          =
+          { main = "Golden.hs"
+          , source-dirs = [ "test-suite-golden/src" ]
+          , dependencies =
+            [ "Cabal"
+            , "Diff"
+            , "directory"
+            , "tasty"
+            , "tasty-golden"
+            , "utf8-string"
+            ]
+          }
         }