Merge pull request #617 from haskell-CI/hlint-3.5

Hlint 3.5

Author: phadej

.github/workflows/haskell-ci.yml

@@ -150,7 +150,7 @@ jobs:
       - name: cache (tools)
         uses: actions/cache@v2
         with:
-          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-7252f917
+          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-ddfe230f
           path: ~/.haskell-ci-tools
       - name: install cabal-plan
         run: |
@@ -174,6 +174,12 @@ jobs:
         run: |
           if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi
           if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi
+      - name: install hlint
+        run: |
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then HLINTVER=$(cd /tmp && (${CABAL} v2-install -v $ARG_COMPILER --dry-run hlint  --constraint='hlint >=3.5 && <3.6' |  perl -ne 'if (/\bhlint-(\d+(\.\d+)*)\b/) { print "$1"; last; }')); echo "HLint version $HLINTVER" ; fi
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then if [ ! -e $HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint ]; then echo "Downloading HLint version $HLINTVER"; mkdir -p $HOME/.haskell-ci-tools; curl --write-out 'Status Code: %{http_code} Redirects: %{num_redirects} Total time: %{time_total} Total Dsize: %{size_download}\n' --silent --location --output $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz "https://github.com/ndmitchell/hlint/releases/download/v$HLINTVER/hlint-$HLINTVER-x86_64-linux.tar.gz"; tar -xzv -f $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz -C $HOME/.haskell-ci-tools; fi ; fi
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then mkdir -p $CABAL_DIR/bin && ln -sf "$HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint" $CABAL_DIR/bin/hlint ; fi
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then hlint --version ; fi
       - name: checkout
         uses: actions/checkout@v2
         with:
@@ -256,6 +262,11 @@ jobs:
         run: |
           $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all
           cabal-docspec $ARG_COMPILER --verbose --timeout 2
+      - name: hlint
+        run: |
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then (cd ${PKGDIR_haskell_ci} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 -XNoImplicitPrelude -XBangPatterns -XDeriveAnyClass -XDeriveFoldable -XDeriveFunctor -XDeriveGeneric -XDeriveTraversable -XDerivingStrategies -XGeneralizedNewtypeDeriving -XScopedTypeVariables -XTypeOperators src) ; fi
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then (cd ${PKGDIR_haskell_ci} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 cli) ; fi
+          if [ $((HCNUMVER >= 90200 && HCNUMVER < 90400)) -ne 0 ] ; then (cd ${PKGDIR_cabal_install_parsers} && hlint -h ${GITHUB_WORKSPACE}/source/.hlint.yaml -XHaskell2010 src) ; fi
       - name: cabal check
         run: |
           cd ${PKGDIR_haskell_ci} || false

cabal.haskell-ci

@@ -69,7 +69,7 @@ folds: constraint-sets
 
 -- Run HLint
 hlint: True
-hlint-job: 9.0.1
+hlint-job: 9.2.4
 hlint-yaml: .hlint.yaml
 hlint-download-binary: True
 -- hlint-version: ==3.1.*

haskell-ci.cabal

@@ -1,6 +1,6 @@
 cabal-version:      2.2
 name:               haskell-ci
-version:            0.15.20220826
+version:            0.15.20220920
 synopsis:           Cabal package script generator for Travis-CI
 description:
   Script generator (@haskell-ci@) for

src/HaskellCI/Auxiliary.hs

@@ -88,9 +88,9 @@ auxiliary Config {..} prj JobVersions {..} = Auxiliary {..}
     extraCabalProjectFields rootdir = buildList $ do
         -- generate package fields for URI packages.
         for_ uris $ \uri ->
-            item $ C.PrettyField () "packages" $ PP.text $ if
-                | URI.uriScheme uri == "file:" -> rootdir ++ URI.uriPath uri
-                | otherwise                    -> uriToString id uri ""
+            item $ C.PrettyField () "packages" $ PP.text $ case URI.uriScheme uri of
+                "file:" -> rootdir ++ URI.uriPath uri
+                _       -> uriToString id uri ""
 
         -- copy fields from original cabal.project
         case cfgCopyFields of

src/HaskellCI/Bash.hs

@@ -198,7 +198,7 @@ makeBash _argv config@Config {..} prj jobs@JobVersions {..} = do
             change_dir "$BUILDDIR"
 
         -- haddock
-        when (not (equivVersionRanges C.noVersion cfgHaddock)) $ step "haddock" $ do
+        unless (equivVersionRanges C.noVersion cfgHaddock) $ step "haddock" $ do
             let range = RangeGHC /\ Range cfgHaddock
             run_cmd_if range "$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all"
 

src/HaskellCI/Compiler.hs

@@ -190,7 +190,7 @@ previewGHC
     -> CompilerVersion
     -> Bool
 previewGHC _vr GHCHead   = True
-previewGHC  vr (GHC v)   = withinRange v vr || odd (snd (ghcMajVer v)) || maybe False (v >=) (fmap fst ghcAlpha)
+previewGHC  vr (GHC v)   = withinRange v vr || odd (snd (ghcMajVer v)) || maybe False (\(v', _) -> v >= v') ghcAlpha
 previewGHC _vr (GHCJS _) = False
 
 ghcMajVer :: Version -> (Int,Int)

src/HaskellCI/Config/HLint.hs

@@ -31,7 +31,7 @@ data HLintConfig = HLintConfig
 -------------------------------------------------------------------------------
 
 defaultHLintVersion :: VersionRange
-defaultHLintVersion = withinVersion (mkVersion [3,3])
+defaultHLintVersion = withinVersion (mkVersion [3,5])
 
 -------------------------------------------------------------------------------
 -- HLintJob

src/HaskellCI/Travis.hs

@@ -375,7 +375,7 @@ makeTravis argv config@Config {..} prj jobs@JobVersions {..} = do
                 "(cd " ++ pkgNameDirVariable pkgName ++ " && ${CABAL} -vnormal check)"
 
         -- haddock
-        when (not (equivVersionRanges C.noVersion cfgHaddock)) $
+        unless (equivVersionRanges C.noVersion cfgHaddock) $
             foldedSh FoldHaddock "haddock..." cfgFolds $
                 shForJob (RangeGHC /\ Range cfgHaddock) $ cabal $ "v2-haddock --haddock-all $WITHCOMPILER " ++ withHaddock ++ " ${TEST} ${BENCH} all"