diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github index f6ef2a67..e7c3626e 100644 --- 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.12.0.20241014 + - compiler: ghc-9.12.20241014 compilerKind: ghc - compilerVersion: 9.12.0.20241014 + compilerVersion: 9.12.20241014 setup-method: ghcup allow-failure: false - compiler: ghc-9.10.1 diff --git a/fixtures/doctest-version.github b/fixtures/doctest-version.github index bb6e8ce7..44dcaf20 100644 --- 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.12.0.20241014 + - compiler: ghc-9.12.20241014 compilerKind: ghc - compilerVersion: 9.12.0.20241014 + compilerVersion: 9.12.20241014 setup-method: ghcup allow-failure: false - compiler: ghc-9.10.1 diff --git a/fixtures/doctest.github b/fixtures/doctest.github index d1c128c5..895edd77 100644 --- 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.12.0.20241014 + - compiler: ghc-9.12.20241014 compilerKind: ghc - compilerVersion: 9.12.0.20241014 + compilerVersion: 9.12.20241014 setup-method: ghcup allow-failure: false - compiler: ghc-9.10.1 diff --git a/fixtures/enabled-jobs.github b/fixtures/enabled-jobs.github index f7edad73..3f86ade6 100644 --- 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.12.0.20241014 + - compiler: ghc-9.12.20241014 compilerKind: ghc - compilerVersion: 9.12.0.20241014 + compilerVersion: 9.12.20241014 setup-method: ghcup allow-failure: false - compiler: ghc-9.10.1 diff --git a/src/HaskellCI/Compiler.hs b/src/HaskellCI/Compiler.hs index e4f02dc8..3fe0df5c 100644 --- a/src/HaskellCI/Compiler.hs +++ b/src/HaskellCI/Compiler.hs @@ -185,7 +185,10 @@ dispCabalVersion :: Maybe Version -> String dispCabalVersion = maybe "head" C.prettyShow ghcAlpha :: Maybe (Version, Version) -ghcAlpha = Just (mkVersion [9,12,1], mkVersion [9,12,0,20241014]) +-- Due to a packaging mistake, GHC 9.12.1-alpha1 uses the version number +-- 9.12.20241014 rather than 9.12.0.20241014. See +-- https://gitlab.haskell.org/ghc/ghc/-/issues/25123#note_591718 +ghcAlpha = Just (mkVersion [9,12,1], mkVersion [9,12,20241014]) -- | GHC HEAD, and versions specified by head.hackage option. usesHeadHackage