Merge branch 'master' into ghc-9.8

haskell · Jun 26, 2023 · 0eb6550 · 0eb6550
2 parents 74517d4 + be30621
commit 0eb6550
Show file tree

Hide file tree

Showing 7 changed files with 623 additions and 549 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1 @@
+17a9895f94d3e86c55ee4a57affdf0b15db39aab
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,25 +48,15 @@ jobs:
             compilerVersion: 8.10.7
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-8.6.5
-            compilerKind: ghc
-            compilerVersion: 8.6.5
-            setup-method: hvr-ppa
-            allow-failure: false
-          - compiler: ghc-8.4.4
-            compilerKind: ghc
-            compilerVersion: 8.4.4
-            setup-method: hvr-ppa
-            allow-failure: false
-          - compiler: ghc-8.2.2
+          - compiler: ghc-8.8.4
             compilerKind: ghc
-            compilerVersion: 8.2.2
-            setup-method: hvr-ppa
+            compilerVersion: 8.8.4
+            setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-8.0.2
+          - compiler: ghc-8.6.5
             compilerKind: ghc
-            compilerVersion: 8.0.2
-            setup-method: hvr-ppa
+            compilerVersion: 8.6.5
+            setup-method: ghcup
             allow-failure: false
       fail-fast: false
     steps: