Merge pull request #711 from haskell-CI/ghc-9.10-alpha2

GHC-9.10 alpha2 i.e. ghc-9.10.0.20240328
haskell-CI · Apr 2, 2024 · e81a202 · e81a202
2 parents c07791e + 01c785f
commit e81a202
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -185,7 +185,7 @@ jobs:
           cabal-docspec --version
       - name: install doctest
         run: |
-          if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi
+          if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.22.0' ; fi
           if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi
       - name: save cache (tools)
         uses: actions/cache/save@v3

diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github
@@ -33,9 +33,9 @@ jobs:
             compilerVersion: "8.4"
             setup-method: hvr-ppa
             allow-failure: false
-          - compiler: ghc-9.10.0.20240313
+          - compiler: ghc-9.10.0.20240328
             compilerKind: ghc
-            compilerVersion: 9.10.0.20240313
+            compilerVersion: 9.10.0.20240328
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.8.2

diff --git a/fixtures/doctest-version.github b/fixtures/doctest-version.github
@@ -33,9 +33,9 @@ jobs:
             compilerVersion: "8.4"
             setup-method: hvr-ppa
             allow-failure: false
-          - compiler: ghc-9.10.0.20240313
+          - compiler: ghc-9.10.0.20240328
             compilerKind: ghc
-            compilerVersion: 9.10.0.20240313
+            compilerVersion: 9.10.0.20240328
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.8.2

diff --git a/fixtures/doctest.github b/fixtures/doctest.github
@@ -33,9 +33,9 @@ jobs:
             compilerVersion: "8.4"
             setup-method: hvr-ppa
             allow-failure: false
-          - compiler: ghc-9.10.0.20240313
+          - compiler: ghc-9.10.0.20240328
             compilerKind: ghc
-            compilerVersion: 9.10.0.20240313
+            compilerVersion: 9.10.0.20240328
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.8.2

diff --git a/fixtures/enabled-jobs.github b/fixtures/enabled-jobs.github
@@ -33,9 +33,9 @@ jobs:
             compilerVersion: "8.4"
             setup-method: hvr-ppa
             allow-failure: false
-          - compiler: ghc-9.10.0.20240313
+          - compiler: ghc-9.10.0.20240328
             compilerKind: ghc
-            compilerVersion: 9.10.0.20240313
+            compilerVersion: 9.10.0.20240328
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.8.2

diff --git a/haskell-ci.cabal b/haskell-ci.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.2
 name:               haskell-ci
-version:            0.19.20240316
+version:            0.19.20240402
 synopsis:           Cabal package script generator for Travis-CI
 description:
   Script generator (@haskell-ci@) for

diff --git a/haskell-ci.sh b/haskell-ci.sh
@@ -447,7 +447,7 @@ run_cmd cabal-plan --version
 # install doctest
 put_info "install doctest"
 # install doctest
-run_cmd_if $((HCNUMVER < 90000)) $CABAL v2-install $ARG_COMPILER --ignore-project -j doctest --constraint='doctest ^>=0.20'
+run_cmd_if $((HCNUMVER < 90000)) $CABAL v2-install $ARG_COMPILER --ignore-project -j doctest --constraint='doctest ^>=0.22.0'
 run_cmd_if $((HCNUMVER < 90000)) doctest --version
 
 # initial cabal.project for sdist

diff --git a/src/HaskellCI/Compiler.hs b/src/HaskellCI/Compiler.hs
@@ -190,7 +190,7 @@ dispCabalVersion :: Maybe Version -> String
 dispCabalVersion = maybe "head" C.prettyShow
 
 ghcAlpha :: Maybe (Version, Version)
-ghcAlpha = Just (mkVersion [9,10,1], mkVersion [9,10,0,20240313])
+ghcAlpha = Just (mkVersion [9,10,1], mkVersion [9,10,0,20240328])
 
 -- | GHC HEAD, and versions specified by head.hackage option.
 usesHeadHackage