Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ jobs:
- name: install cabal-docspec
run: |
mkdir -p $HOME/.cabal/bin
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20231219/cabal-docspec-0.0.0.20231219-x86_64-linux.xz > cabal-docspec.xz
echo '8b60448275466bbe2b9409741b5dd07a41c541283017b95b44efe6e31379d067 cabal-docspec.xz' | sha256sum -c -
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240414/cabal-docspec-0.0.0.20240414-x86_64-linux.xz > cabal-docspec.xz
echo '2d18a3f79619e8ec5f11870f926f6dc2616e02a6c889315b7f82044b95a1adb9 cabal-docspec.xz' | sha256sum -c -
xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
rm -f cabal-docspec.xz
chmod a+x $HOME/.cabal/bin/cabal-docspec
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HC ?= ghc-9.2.8
HC ?= ghc-9.8.2

build :
cabal v2-build -w $(HC)
Expand Down
2 changes: 1 addition & 1 deletion haskell-ci.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: haskell-ci
version: 0.19.20240402
version: 0.19.20240414
synopsis: Cabal package script generator for Travis-CI
description:
Script generator (@haskell-ci@) for
Expand Down
4 changes: 2 additions & 2 deletions src/HaskellCI/Config/Docspec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ defaultDocspecConfig :: DocspecConfig
defaultDocspecConfig = DocspecConfig
{ cfgDocspecEnabled = noVersion
, cfgDocspecOptions = []
, cfgDocspecUrl = "https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20231219/cabal-docspec-0.0.0.20231219-x86_64-linux.xz"
, cfgDocspecHash = "8b60448275466bbe2b9409741b5dd07a41c541283017b95b44efe6e31379d067"
, cfgDocspecUrl = "https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240414/cabal-docspec-0.0.0.20240414-x86_64-linux.xz"
, cfgDocspecHash = "2d18a3f79619e8ec5f11870f926f6dc2616e02a6c889315b7f82044b95a1adb9"
}

-------------------------------------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/HaskellCI/Config/Installed.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import qualified Distribution.Pretty as C
import qualified Distribution.Types.PackageName as C
import qualified Text.PrettyPrint as PP

-- $setup
-- >>> import qualified Distribution.Parsec as C

-------------------------------------------------------------------------------
-- Single action
-------------------------------------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/HaskellCI/Config/Jobs.hs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import qualified Distribution.Parsec as C
import qualified Distribution.Pretty as C
import qualified Text.PrettyPrint as PP

-- $setup
-- >>> import qualified Distribution.Parsec as C

-- | Jobs
--
-- * @N:M@ - @N@ ghcs (cabal -j), @M@ threads (ghc -j)
Expand Down
2 changes: 2 additions & 0 deletions src/HaskellCI/GitHub.hs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
module HaskellCI.GitHub (
makeGitHub,
githubHeader,
-- * For tests
parseGitHubRepo,
) where

import HaskellCI.Prelude
Expand Down
5 changes: 4 additions & 1 deletion src/HaskellCI/ShVersionRange.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
module HaskellCI.ShVersionRange (
compilerVersionPredicate,
compilerVersionArithPredicate,
) where
roundDown,
) where

import HaskellCI.Prelude

Expand All @@ -16,6 +17,8 @@ import HaskellCI.Compiler

-- $setup
-- >>> import Distribution.Pretty (prettyShow)
-- >>> import qualified Data.Set as S
-- >>> import qualified Distribution.Version as C

compilerVersionPredicate :: Set CompilerVersion -> CompilerRange -> String
compilerVersionPredicate = compilerVersionPredicateImpl (toTest . freeToArith) where
Expand Down
6 changes: 5 additions & 1 deletion src/HaskellCI/YamlSyntax.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ module HaskellCI.YamlSyntax (
(~>),
ykeyValuesFilt,
ylistFilt,
) where
-- * Exported for tests
encodeYAMLString,
hexChar,
) where

import HaskellCI.Prelude
import Prelude ()
Expand Down Expand Up @@ -43,6 +46,7 @@ import Numeric (showHex)

-- $setup
-- >>> :set -XOverloadedStrings
-- >>> import qualified Data.Aeson as Aeson

-------------------------------------------------------------------------------
-- Yaml syntx
Expand Down