From 9c8c963021608f09e93d486e5339e45073c757bc Mon Sep 17 00:00:00 2001 From: cydparser Date: Tue, 2 Jul 2024 21:30:05 -0700 Subject: [PATCH 1/2] Fix brittle test --- test/suite/Heist/Tests.hs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/test/suite/Heist/Tests.hs b/test/suite/Heist/Tests.hs index 9774341..002f3af 100644 --- a/test/suite/Heist/Tests.hs +++ b/test/suite/Heist/Tests.hs @@ -48,25 +48,16 @@ tests = [ testCase "loadErrors" loadErrorsTest loadErrorsTest :: H.Assertion loadErrorsTest = do ets <- loadIO "templates-bad" mempty mempty mempty mempty - either (H.assertEqual "load errors test" expected . sort) + either (H.assertEqual "load errors test" expected . fmap (head . lines) . sort) (const $ H.assertFailure "No failure when loading templates-bad") ets where expected = sort -#if MIN_VERSION_base(4,9,0) - ["templates-bad/apply-missing-attr.tpl: must supply \"template\" attribute in \nCallStack (from HasCallStack):\n error, called at src/Heist/Common.hs:76:15 in main:Heist.Common" - ,"templates-bad/apply-template-not-found.tpl: apply tag cannot find template \"/page\"\nCallStack (from HasCallStack):\n error, called at src/Heist/Common.hs:76:15 in main:Heist.Common" - ,"templates-bad/bind-infinite-loop.tpl: template recursion exceeded max depth, you probably have infinite splice recursion!\nCallStack (from HasCallStack):\n error, called at src/Heist/Common.hs:76:15 in main:Heist.Common" - ,"templates-bad/bind-missing-attr.tpl: must supply \"tag\" attribute in \nCallStack (from HasCallStack):\n error, called at src/Heist/Common.hs:76:15 in main:Heist.Common" - ] -#else - ["templates-bad/bind-infinite-loop.tpl: template recursion exceeded max depth, you probably have infinite splice recursion!" + ["templates-bad/apply-missing-attr.tpl: must supply \"template\" attribute in " ,"templates-bad/apply-template-not-found.tpl: apply tag cannot find template \"/page\"" + ,"templates-bad/bind-infinite-loop.tpl: template recursion exceeded max depth, you probably have infinite splice recursion!" ,"templates-bad/bind-missing-attr.tpl: must supply \"tag\" attribute in " - ,"templates-bad/apply-missing-attr.tpl: must supply \"template\" attribute in " ] -#endif - attrSpliceTest :: IO () attrSpliceTest = do From 7614318a304c8852c6e1d8e1982e6fbe25b565b0 Mon Sep 17 00:00:00 2001 From: cydparser Date: Tue, 2 Jul 2024 21:30:12 -0700 Subject: [PATCH 2/2] Bump GHC version for non-Linux checks --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9940105..aab3391 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,8 +39,8 @@ jobs: - "9.8" - "9.10" include: - - { os: macOS-latest, ghc: "9.8" } - - { os: windows-latest, ghc: "9.8" } + - { os: macOS-latest, ghc: "9.10" } + - { os: windows-latest, ghc: "9.10" } steps: - uses: actions/checkout@v4 @@ -105,7 +105,7 @@ jobs: steps: - uses: nikeee/setup-pandoc@v1 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: haskell-actions/setup@v2 name: Setup Haskell Stack