From 95a3b537940dee07f3ce3b263db6cd3b5c87700d Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 14 Apr 2024 16:00:11 +0300 Subject: [PATCH] cabal-docspec-0.0.0.20240414 --- .github/workflows/haskell-ci.yml | 4 ++-- Makefile | 2 +- haskell-ci.cabal | 2 +- src/HaskellCI/Config/Docspec.hs | 4 ++-- src/HaskellCI/Config/Installed.hs | 3 +++ src/HaskellCI/Config/Jobs.hs | 3 +++ src/HaskellCI/GitHub.hs | 2 ++ src/HaskellCI/ShVersionRange.hs | 5 ++++- src/HaskellCI/YamlSyntax.hs | 6 +++++- 9 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 9a9e3c48..7f11501b 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -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 diff --git a/Makefile b/Makefile index b90a7255..28af422a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -HC ?= ghc-9.2.8 +HC ?= ghc-9.8.2 build : cabal v2-build -w $(HC) diff --git a/haskell-ci.cabal b/haskell-ci.cabal index 8f5387cc..32a48d64 100644 --- a/haskell-ci.cabal +++ b/haskell-ci.cabal @@ -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 diff --git a/src/HaskellCI/Config/Docspec.hs b/src/HaskellCI/Config/Docspec.hs index 838389a0..750ed654 100644 --- a/src/HaskellCI/Config/Docspec.hs +++ b/src/HaskellCI/Config/Docspec.hs @@ -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" } ------------------------------------------------------------------------------- diff --git a/src/HaskellCI/Config/Installed.hs b/src/HaskellCI/Config/Installed.hs index 703a374d..7fc10bdd 100644 --- a/src/HaskellCI/Config/Installed.hs +++ b/src/HaskellCI/Config/Installed.hs @@ -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 ------------------------------------------------------------------------------- diff --git a/src/HaskellCI/Config/Jobs.hs b/src/HaskellCI/Config/Jobs.hs index aac4db20..3d9b1670 100644 --- a/src/HaskellCI/Config/Jobs.hs +++ b/src/HaskellCI/Config/Jobs.hs @@ -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) diff --git a/src/HaskellCI/GitHub.hs b/src/HaskellCI/GitHub.hs index aaa29edc..d9cd7019 100644 --- a/src/HaskellCI/GitHub.hs +++ b/src/HaskellCI/GitHub.hs @@ -5,6 +5,8 @@ module HaskellCI.GitHub ( makeGitHub, githubHeader, + -- * For tests + parseGitHubRepo, ) where import HaskellCI.Prelude diff --git a/src/HaskellCI/ShVersionRange.hs b/src/HaskellCI/ShVersionRange.hs index 2189cf0b..7767e164 100644 --- a/src/HaskellCI/ShVersionRange.hs +++ b/src/HaskellCI/ShVersionRange.hs @@ -1,7 +1,8 @@ module HaskellCI.ShVersionRange ( compilerVersionPredicate, compilerVersionArithPredicate, - ) where + roundDown, +) where import HaskellCI.Prelude @@ -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 diff --git a/src/HaskellCI/YamlSyntax.hs b/src/HaskellCI/YamlSyntax.hs index 3aa2fc13..1eb91caf 100644 --- a/src/HaskellCI/YamlSyntax.hs +++ b/src/HaskellCI/YamlSyntax.hs @@ -13,7 +13,10 @@ module HaskellCI.YamlSyntax ( (~>), ykeyValuesFilt, ylistFilt, - ) where + -- * Exported for tests + encodeYAMLString, + hexChar, +) where import HaskellCI.Prelude import Prelude () @@ -43,6 +46,7 @@ import Numeric (showHex) -- $setup -- >>> :set -XOverloadedStrings +-- >>> import qualified Data.Aeson as Aeson ------------------------------------------------------------------------------- -- Yaml syntx