CI: trying ghc 9.8

lyokha · Nov 30, 2023 · 747af8e · 747af8e
1 parent 194b3ed
commit 747af8e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,6 +13,9 @@ jobs:
         cabal: ['3.8']
         experimental: [false]
         include:
+          - ghc: '9.8'
+            cabal: '3.10'
+            experimental: true
           - ghc: '9.6'
             cabal: '3.10'
             experimental: false

diff --git a/NgxExport/Tools/PCRE.hs b/NgxExport/Tools/PCRE.hs
@@ -209,10 +209,9 @@ rtRegex f = fmap L.fromStrict . uncurry doRtRegex .
 doMatchRegex :: RegexF
 doMatchRegex r v = return $
     case match r v [] of
-        Nothing -> ""
-        Just cs -> if captureCount r == 0
-                       then head cs
-                       else head $ tail cs
+        Just (_ : c1 : _) -> c1
+        Just (c0 : _) -> c0
+        _ -> ""
 
 -- | Matches a value against a named regex.
 --

diff --git a/ngx-export-tools-extra.cabal b/ngx-export-tools-extra.cabal
@@ -6,7 +6,7 @@ description:                More extra tools for
 homepage:                   https://github.com/lyokha/ngx-export-tools-extra
 license:                    BSD3
 license-file:               LICENSE
-extra-source-files:         Changelog.md
+extra-doc-files:            Changelog.md
 author:                     Alexey Radkov <alexey.radkov@gmail.com>
 maintainer:                 Alexey Radkov <alexey.radkov@gmail.com>
 stability:                  stable
@@ -17,7 +17,7 @@ cabal-version:              1.20
 
 source-repository head
   type:                     git
-  location:                 https://github.com/lyokha/ngx-export-tools-extra
+  location:                 https://github.com/lyokha/ngx-export-tools-extra.git
 
 flag EDE
   description:              Build EDE module.