Bump CI to GHC 9.8.1

stevenfontanella · Oct 11, 2023 · 11ffecd · 11ffecd
1 parent ab15112
commit 11ffecd
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 49 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -8,20 +8,18 @@
 #
 # For more information, see https://github.com/andreasabel/haskell-ci
 #
-# version: 0.17.20231002
+# version: 0.17.20231010
 #
-# REGENDATA ("0.17.20231002",["github","cabal.project"])
+# REGENDATA ("0.17.20231010",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
   push:
     branches:
       - master
-      - ci*
   pull_request:
     branches:
       - master
-      - ci*
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -34,11 +32,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.8.0.20230929
+          - compiler: ghc-9.8.1
             compilerKind: ghc
-            compilerVersion: 9.8.0.20230929
+            compilerVersion: 9.8.1
             setup-method: ghcup
-            allow-failure: true
+            allow-failure: false
           - compiler: ghc-9.6.3
             compilerKind: ghc
             compilerVersion: 9.6.3
@@ -148,7 +146,7 @@ jobs:
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
           echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
-          if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
+          echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
           echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
           echo "GHCJSARITH=0" >> "$GITHUB_ENV"
         env:
@@ -177,18 +175,6 @@ jobs:
           repository hackage.haskell.org
             url: http://hackage.haskell.org/
           EOF
-          if $HEADHACKAGE; then
-          cat >> $CABAL_CONFIG <<EOF
-          repository head.hackage.ghc.haskell.org
-             url: https://ghc.gitlab.haskell.org/head.hackage/
-             secure: True
-             root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-                        26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
-                        f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
-             key-threshold: 3
-          active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
-          EOF
-          fi
           cat >> $CABAL_CONFIG <<EOF
           program-default-options
             ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -269,11 +255,7 @@ jobs:
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package microlens-th" >> cabal.project ; fi
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
           cat >> cabal.project <<EOF
-          allow-newer: text
           EOF
-          if $HEADHACKAGE; then
-          echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
-          fi
           $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(microlens|microlens-contra|microlens-ghc|microlens-mtl|microlens-platform|microlens-th)$/; }' >> cabal.project.local
           cat cabal.project
           cat cabal.project.local
@@ -321,16 +303,6 @@ jobs:
         run: |
           rm -f cabal.project.local
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
-      - name: prepare for constraint sets
-        run: |
-          rm -f cabal.project.local
-      - name: constraint set text-2.1
-        run: |
-          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' all --dry-run ; fi
-          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then cabal-plan topo | sort ; fi
-          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' --dependencies-only -j2 all ; fi
-          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' all ; fi
-          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' all ; fi
       - name: save cache
         uses: actions/cache/save@v3
         if: always()

diff --git a/cabal.haskell-ci b/cabal.haskell-ci
@@ -1,12 +1,13 @@
-branches: master ci*
+branches: master
 
 haddock: <8.1 || >8.3
 
-constraint-set text-2.1
-  ghc: >= 8.2
-  constraints: text ^>= 2.1
-  tests: True
-  run-tests: True
-
-raw-project
-  allow-newer: text
+-- text-2.1 is covered by GHC 9.8
+-- constraint-set text-2.1
+--   ghc: >= 8.2
+--   constraints: text ^>= 2.1
+--   tests: True
+--   run-tests: True
+--
+-- raw-project
+--   allow-newer: text
diff --git a/microlens-contra/microlens-contra.cabal b/microlens-contra/microlens-contra.cabal
@@ -21,7 +21,7 @@ extra-source-files:
   CHANGELOG.md
 cabal-version:       >=1.10
 tested-with:
-                     GHC==9.8.0
+                     GHC==9.8.1
                      GHC==9.6.3
                      GHC==9.4.7
                      GHC==9.2.8

diff --git a/microlens-ghc/microlens-ghc.cabal b/microlens-ghc/microlens-ghc.cabal
@@ -19,7 +19,7 @@ extra-source-files:
   CHANGELOG.md
 cabal-version:       >=1.10
 tested-with:
-                     GHC==9.8.0
+                     GHC==9.8.1
                      GHC==9.6.3
                      GHC==9.4.7
                      GHC==9.2.8

diff --git a/microlens-mtl/microlens-mtl.cabal b/microlens-mtl/microlens-mtl.cabal
@@ -18,7 +18,7 @@ extra-source-files:
   CHANGELOG.md
 cabal-version:       >=1.10
 tested-with:
-                     GHC==9.8.0
+                     GHC==9.8.1
                      GHC==9.6.3
                      GHC==9.4.7
                      GHC==9.2.8

diff --git a/microlens-platform/microlens-platform.cabal b/microlens-platform/microlens-platform.cabal
@@ -19,7 +19,7 @@ extra-source-files:
   CHANGELOG.md
 cabal-version:       >=1.10
 tested-with:
-                     GHC==9.8.0
+                     GHC==9.8.1
                      GHC==9.6.3
                      GHC==9.4.7
                      GHC==9.2.8

diff --git a/microlens-th/microlens-th.cabal b/microlens-th/microlens-th.cabal
@@ -17,7 +17,7 @@ extra-source-files:
   CHANGELOG.md
 cabal-version:       >=1.10
 tested-with:
-                     GHC==9.8.0
+                     GHC==9.8.1
                      GHC==9.6.3
                      GHC==9.4.7
                      GHC==9.2.8

diff --git a/microlens/microlens.cabal b/microlens/microlens.cabal
@@ -42,7 +42,7 @@ extra-source-files:
   CHANGELOG.md
 cabal-version:       >=1.10
 tested-with:
-                     GHC==9.8.0
+                     GHC==9.8.1
                      GHC==9.6.3
                      GHC==9.4.7
                      GHC==9.2.8