From 1c3b84dce363e3e3ff57d936e54b42bf044d0177 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 3 Dec 2023 14:40:15 +0200 Subject: [PATCH] Use doctest-0.22 by default --- .github/workflows/haskell-ci.yml | 4 ++-- haskell-ci.cabal | 2 +- src/HaskellCI/Config/Doctest.hs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 26ea7fb5..10ee72ba 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -152,7 +152,7 @@ jobs: - name: cache (tools) uses: actions/cache/restore@v3 with: - key: ${{ runner.os }}-${{ matrix.compiler }}-tools-f01e9287 + key: ${{ runner.os }}-${{ matrix.compiler }}-tools-e27a5680 path: ~/.haskell-ci-tools - name: install cabal-plan run: | @@ -180,7 +180,7 @@ jobs: uses: actions/cache/save@v3 if: always() with: - key: ${{ runner.os }}-${{ matrix.compiler }}-tools-f01e9287 + key: ${{ runner.os }}-${{ matrix.compiler }}-tools-e27a5680 path: ~/.haskell-ci-tools - name: checkout uses: actions/checkout@v3 diff --git a/haskell-ci.cabal b/haskell-ci.cabal index 186829d7..45551c77 100644 --- a/haskell-ci.cabal +++ b/haskell-ci.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: haskell-ci -version: 0.17.20231110 +version: 0.17.20231203 synopsis: Cabal package script generator for Travis-CI description: Script generator (@haskell-ci@) for diff --git a/src/HaskellCI/Config/Doctest.hs b/src/HaskellCI/Config/Doctest.hs index 00bf0dfb..92fce2b5 100644 --- a/src/HaskellCI/Config/Doctest.hs +++ b/src/HaskellCI/Config/Doctest.hs @@ -26,7 +26,7 @@ data DoctestConfig = DoctestConfig ------------------------------------------------------------------------------- defaultDoctestVersion :: VersionRange -defaultDoctestVersion = majorBoundVersion (mkVersion [0,21,0]) +defaultDoctestVersion = majorBoundVersion (mkVersion [0,22,0]) ------------------------------------------------------------------------------- -- Grammar