From df7513d7cfb1007b1926ea2f0e53bd61c620fb82 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Thu, 21 Nov 2024 13:31:09 +0200 Subject: [PATCH] GHC-9.12-alpha3 --- fixtures/all-versions.github | 4 ++-- fixtures/doctest-version.github | 4 ++-- fixtures/doctest.github | 4 ++-- fixtures/enabled-jobs.github | 4 ++-- haskell-ci.cabal | 4 ++-- src/HaskellCI/Config/History.hs | 4 +++- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github index a97587fd..c815071e 100644 --- a/fixtures/all-versions.github +++ b/fixtures/all-versions.github @@ -28,9 +28,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.0.20241031 + - compiler: ghc-9.12.0.20241114 compilerKind: ghc - compilerVersion: 9.12.0.20241031 + compilerVersion: 9.12.0.20241114 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 4e3bed88..efdf6f4a 100644 --- a/fixtures/doctest-version.github +++ b/fixtures/doctest-version.github @@ -28,9 +28,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.0.20241031 + - compiler: ghc-9.12.0.20241114 compilerKind: ghc - compilerVersion: 9.12.0.20241031 + compilerVersion: 9.12.0.20241114 setup-method: ghcup-prerelease allow-failure: false - compiler: ghc-9.10.1 diff --git a/fixtures/doctest.github b/fixtures/doctest.github index 274809d0..1afd3562 100644 --- a/fixtures/doctest.github +++ b/fixtures/doctest.github @@ -28,9 +28,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.0.20241031 + - compiler: ghc-9.12.0.20241114 compilerKind: ghc - compilerVersion: 9.12.0.20241031 + compilerVersion: 9.12.0.20241114 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 07da5776..2e1966c6 100644 --- a/fixtures/enabled-jobs.github +++ b/fixtures/enabled-jobs.github @@ -28,9 +28,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.0.20241031 + - compiler: ghc-9.12.0.20241114 compilerKind: ghc - compilerVersion: 9.12.0.20241031 + compilerVersion: 9.12.0.20241114 setup-method: ghcup-prerelease allow-failure: false - compiler: ghc-9.10.1 diff --git a/haskell-ci.cabal b/haskell-ci.cabal index 858deeb5..db55edde 100644 --- a/haskell-ci.cabal +++ b/haskell-ci.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: haskell-ci -version: 0.19.20241114 +version: 0.19.20241121 synopsis: Cabal package script generator for Travis-CI description: Script generator (@haskell-ci@) for @@ -239,4 +239,4 @@ test-suite golden , Diff ^>=0.4.0 || ^>=0.5 , tasty ^>=1.4.1 || ^>=1.5 , tasty-golden ^>=2.3.1.1 - , tasty-hunit \ No newline at end of file + , tasty-hunit diff --git a/src/HaskellCI/Config/History.hs b/src/HaskellCI/Config/History.hs index e13fcfad..9e3409bd 100644 --- a/src/HaskellCI/Config/History.hs +++ b/src/HaskellCI/Config/History.hs @@ -39,7 +39,7 @@ configHistory = , ghcupVanilla = C.withinVersion (C.mkVersion [9,8,3]) , ghcupPrerelease = C.orLaterVersion (C.mkVersion [9,12,0]) } - , ver 0 19 2024114 := \cfg -> cfg + , ver 0 19 20241114 := \cfg -> cfg & field @"cfgSetupMethods" .~ PerSetupMethod { hvrPpa = C.noVersion , ghcup = invertVersionRange (C.withinVersion (C.mkVersion [9,8,3])) /\ C.earlierVersion (C.mkVersion [9,12]) @@ -48,6 +48,8 @@ configHistory = } , ver 0 19 20241117 := \cfg -> cfg & 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]) ] where ver x y z = [x, y, z]