From f855969834a30990c6ce29dbc48218450f9e7c8a Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Mon, 2 Dec 2024 19:58:36 +0200 Subject: [PATCH] Use GHC-9.12-rc1 (9.12.0.20241128) --- fixtures/all-versions.github | 4 ++-- fixtures/doctest-version.github | 4 ++-- fixtures/doctest.github | 4 ++-- fixtures/enabled-jobs.github | 4 ++-- haskell-ci.cabal | 2 +- src/HaskellCI/Config/History.hs | 2 ++ 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github index c8583c8e..d7600d4d 100644 --- a/fixtures/all-versions.github +++ b/fixtures/all-versions.github @@ -28,9 +28,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.0.20241114 + - compiler: ghc-9.12.0.20241128 compilerKind: ghc - compilerVersion: 9.12.0.20241114 + compilerVersion: 9.12.0.20241128 setup-method: ghcup-prerelease allow-failure: false - compiler: ghc-9.10.1 diff --git a/fixtures/doctest-version.github b/fixtures/doctest-version.github index 29a34844..c0c66c5c 100644 --- a/fixtures/doctest-version.github +++ b/fixtures/doctest-version.github @@ -28,9 +28,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.0.20241114 + - compiler: ghc-9.12.0.20241128 compilerKind: ghc - compilerVersion: 9.12.0.20241114 + compilerVersion: 9.12.0.20241128 setup-method: ghcup-prerelease allow-failure: false - compiler: ghc-9.10.1 diff --git a/fixtures/doctest.github b/fixtures/doctest.github index 1e09eb39..e58cdceb 100644 --- a/fixtures/doctest.github +++ b/fixtures/doctest.github @@ -28,9 +28,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.0.20241114 + - compiler: ghc-9.12.0.20241128 compilerKind: ghc - compilerVersion: 9.12.0.20241114 + compilerVersion: 9.12.0.20241128 setup-method: ghcup-prerelease allow-failure: false - compiler: ghc-9.10.1 diff --git a/fixtures/enabled-jobs.github b/fixtures/enabled-jobs.github index 458573be..a4eb3e79 100644 --- a/fixtures/enabled-jobs.github +++ b/fixtures/enabled-jobs.github @@ -28,9 +28,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.0.20241114 + - compiler: ghc-9.12.0.20241128 compilerKind: ghc - compilerVersion: 9.12.0.20241114 + compilerVersion: 9.12.0.20241128 setup-method: ghcup-prerelease allow-failure: false - compiler: ghc-9.10.1 diff --git a/haskell-ci.cabal b/haskell-ci.cabal index 756d29bf..c37967c5 100644 --- a/haskell-ci.cabal +++ b/haskell-ci.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: haskell-ci -version: 0.19.20241121 +version: 0.19.20241202 synopsis: Haskell CI script generator description: Script generator (@haskell-ci@) for diff --git a/src/HaskellCI/Config/History.hs b/src/HaskellCI/Config/History.hs index 9e3409bd..6028ea49 100644 --- a/src/HaskellCI/Config/History.hs +++ b/src/HaskellCI/Config/History.hs @@ -50,6 +50,8 @@ configHistory = & field @"cfgVersionMapping" .~ Map.singleton (mkVersion [9,12,1]) (mkVersion [9,12,0,20241031]) , ver 0 19 20241121 := \cfg -> cfg & field @"cfgVersionMapping" .~ Map.singleton (mkVersion [9,12,1]) (mkVersion [9,12,0,20241114]) + , ver 0 19 20241202 := \cfg -> cfg + & field @"cfgVersionMapping" .~ Map.singleton (mkVersion [9,12,1]) (mkVersion [9,12,0,20241128]) ] where ver x y z = [x, y, z]