Skip to content

Commit d11a7af

Browse files
travis: use cabal-install 3.0.
1 parent 00fa842 commit d11a7af

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# ++++++++++++++++++++ WARNING ++++++++++++++++++++
22
# This file is generated by 'meta generate'. Don't hand-edit.
33
# ++++++++++++++++++++ WARNING ++++++++++++++++++++
4-
{"sudo":false,"language":"generic","branches":{"only":["staging","trying"]},"notifications":{"email":false},"cache":{"directories":["$HOME/.cabal/store","$HOME/.cabal/bin"]},"matrix":{"fast_finish":true,"allow_failures":[{"env":"PROJECT=ghc-8.8"},{"env":"PROJECT=ghc-head"}]},"jobs":{"include":[{"env":"PROJECT=ghc-8.6","addons":{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}},"before_install":["export PATH=/opt/ghc/bin:$PATH"],"install":"./travis/deps.sh","script":["./travis/build.sh","./travis/meta.sh"]},{"env":"PROJECT=ghc-8.8","addons":{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}},"before_install":["export PATH=/opt/ghc/bin:$PATH"],"install":"./travis/deps.sh","script":["./travis/build.sh"]},{"env":"PROJECT=ghc-head","addons":{"apt":{"sources":["hvr-ghc"],"packages":["ghc-head","cabal-install-head"]}},"before_install":["export PATH=/opt/ghc/bin:$PATH"],"install":"./travis/deps.sh","script":["./travis/build.sh"]},{"env":"PROJECT=ghc-8.4","addons":{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}},"before_install":["export PATH=/opt/ghc/bin:$PATH"],"install":"./travis/deps.sh","script":["./travis/build.sh"]}]}}
4+
{"sudo":false,"language":"generic","branches":{"only":["staging","trying"]},"notifications":{"email":false},"cache":{"directories":["$HOME/.cabal/store","$HOME/.cabal/bin"]},"matrix":{"fast_finish":true,"allow_failures":[{"env":"PROJECT=ghc-8.8"},{"env":"PROJECT=ghc-head"}]},"jobs":{"include":[{"env":"PROJECT=ghc-8.6","addons":{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}},"before_install":["export PATH=/opt/ghc/bin:$PATH"],"install":"./travis/deps.sh","script":["./travis/build.sh","./travis/meta.sh"]},{"env":"PROJECT=ghc-8.8","addons":{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}},"before_install":["export PATH=/opt/ghc/bin:$PATH"],"install":"./travis/deps.sh","script":["./travis/build.sh"]},{"env":"PROJECT=ghc-head","addons":{"apt":{"sources":["hvr-ghc"],"packages":["ghc-head","cabal-install-head"]}},"before_install":["export PATH=/opt/ghc/bin:$PATH"],"install":"./travis/deps.sh","script":["./travis/build.sh"]},{"env":"PROJECT=ghc-8.4","addons":{"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}},"before_install":["export PATH=/opt/ghc/bin:$PATH"],"install":"./travis/deps.sh","script":["./travis/build.sh"]}]}}

packages/meta/src/Q4C12/Meta.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ travisConfiguration buildMap = Aeson.Encoding.pairs $ fold
273273
, Aeson.Encoding.pair "packages" $ Aeson.Encoding.list Aeson.Encoding.text
274274
[ "ghc-" <> ghcAptVersion ghc
275275
, case ghcRegularity ghc of
276-
Regular{} -> "cabal-install-2.4"
276+
Regular{} -> "cabal-install-3.0"
277277
PreRelease ver _ -> "cabal-install-" <> ver
278278
]
279279
]

0 commit comments

Comments
 (0)