Skip to content

Commit

Permalink
Merge pull request #641 from haskell-CI/ghc-9.6.0-alpha3
Browse files Browse the repository at this point in the history
GHC-9.6.1-alpha3
  • Loading branch information
phadej committed Feb 18, 2023
2 parents a3c0e93 + 55dab66 commit 3c8ccd6
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ jobs:
compilerVersion: 9.4.4
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.2.5
- compiler: ghc-9.2.6
compilerKind: ghc
compilerVersion: 9.2.5
compilerVersion: 9.2.6
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.0.2
Expand Down
2 changes: 1 addition & 1 deletion cabal-install-parsers/cabal-install-parsers.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ tested-with:
|| ==8.8.4
|| ==8.10.7
|| ==9.0.2
|| ==9.2.5
|| ==9.2.6
|| ==9.4.4

extra-source-files:
Expand Down
4 changes: 2 additions & 2 deletions fixtures/all-versions.github
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ jobs:
compilerVersion: "8.4"
setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-9.6.0.20230128
- compiler: ghc-9.6.0.20230210
compilerKind: ghc
compilerVersion: 9.6.0.20230128
compilerVersion: 9.6.0.20230210
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.4.4
Expand Down
4 changes: 2 additions & 2 deletions fixtures/enabled-jobs.github
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ jobs:
compilerVersion: "8.4"
setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-9.6.0.20230128
- compiler: ghc-9.6.0.20230210
compilerKind: ghc
compilerVersion: 9.6.0.20230128
compilerVersion: 9.6.0.20230210
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.4.4
Expand Down
2 changes: 1 addition & 1 deletion haskell-ci.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: haskell-ci
version: 0.15.20230211
version: 0.15.20230217
synopsis: Cabal package script generator for Travis-CI
description:
Script generator (@haskell-ci@) for
Expand Down
2 changes: 1 addition & 1 deletion haskell-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fi

CFG_CABAL_STORE_CACHE=""
CFG_CABAL_REPO_CACHE=""
CFG_JOBS="9.4.4 9.2.5 9.0.2 8.10.7 8.8.4 8.6.5 8.4.4 8.2.2"
CFG_JOBS="9.4.4 9.2.6 9.0.2 8.10.7 8.8.4 8.6.5 8.4.4 8.2.2"
CFG_CABAL_UPDATE=false

SCRIPT_NAME=$(basename "$0")
Expand Down
2 changes: 1 addition & 1 deletion src/HaskellCI/Compiler.hs
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ dispCabalVersion :: Maybe Version -> String
dispCabalVersion = maybe "head" C.prettyShow

ghcAlpha :: Maybe (Version, Version)
ghcAlpha = Just (mkVersion [9,6,1], mkVersion [9,6,0,20230128])
ghcAlpha = Just (mkVersion [9,6,1], mkVersion [9,6,0,20230210])

-- | Alphas, RCs and HEAD.
previewGHC
Expand Down

0 comments on commit 3c8ccd6

Please sign in to comment.