on master help sign in
Merge pull request #1242 from haskell-servant/haskell-ci-update

Regenerate .travis.yml

commit1c4e3c4a930256df9240522102d7c1500dab1956 authorOleg Grenrus <oleg.grenrus@iki.fi> dateMon 11 Nov 2019, 16:01 (7 years ago) parent925d50d8507cc5
1 file changed+27−28
.travis.yml+27−28
.travis.yml+27−28
@@ -4,7 +4,7 @@
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
7−# version: 0.5.20190916
7+# version: 0.7.20191106
88#
99language: c
1010dist: xenial
@@ -20,6 +20,7 @@ cache:
2020 directories:
2121 - $HOME/.cabal/packages
2222 - $HOME/.cabal/store
23+ - $HOME/.hlint
2324before_cache:
2425 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2526 # remove files that are regenerated by 'cabal update'
@@ -32,7 +33,7 @@ before_cache:
3233matrix:
3334 include:
3435 - compiler: ghcjs-8.4
35− addons: {"apt":{"sources":["hvr-ghc"],"packages":["cabal-install-3.0"]}}
36+ addons: {"apt":{"sources":["hvr-ghc",{"sourceline":"deb http://ppa.launchpad.net/hvr/ghcjs/ubuntu xenial main"},{"sourceline":"deb https://deb.nodesource.com/node_8.x xenial main","key_url":"https://deb.nodesource.com/gpgkey/nodesource.gpg.key"}],"packages":["ghcjs-8.4","cabal-install-3.0","ghc-8.4.4","nodejs"]}}
3637 - compiler: ghc-8.8.1
3738 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
3839 - compiler: ghc-8.6.5
@@ -50,21 +51,11 @@ before_install:
5051 else
5152 GHCJS=false;
5253 fi
53− - |
54− if [ "$TRAVIS_OS_NAME" = "linux" ]; then
55− if $GHCJS ; then sudo add-apt-repository -y ppa:hvr/ghcjs ; fi;
56− if $GHCJS ; then curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add - ; fi;
57− if $GHCJS ; then sudo apt-add-repository 'https://deb.nodesource.com/node_8.x xenial main' ; fi;
58− if $GHCJS ; then sudo apt-get update ; fi;
59− sudo apt-get install $CC;
60− if $GHCJS ; then sudo apt-get install -y nodejs cabal-install-3.0 ; fi;
61− fi
6254 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
6355 - WITHCOMPILER="-w $HC"
6456 - if $GHCJS ; then HC=${HC}js ; fi
6557 - if $GHCJS ; then WITHCOMPILER="--ghcjs ${WITHCOMPILER}js" ; fi
6658 - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
67− - if $GHCJS ; then sudo apt-get install -y ghc-8.4.4 ; fi
6859 - if $GHCJS ; then PATH="/opt/ghc/8.4.4/bin:$PATH" ; fi
6960 - HCPKG="$HC-pkg"
7061 - unset CC
@@ -104,21 +95,29 @@ install:
10495 - HEADHACKAGE=false
10596 - rm -f $CABALHOME/config
10697 - |
107− echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
108− echo "remote-build-reporting: anonymous" >> $CABALHOME/config
109− echo "write-ghc-environment-files: always" >> $CABALHOME/config
110− echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
111− echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
112− echo "world-file: $CABALHOME/world" >> $CABALHOME/config
113− echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
114− echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
115− echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
116− echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
117− echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
118− echo "install-dirs user" >> $CABALHOME/config
119− echo " prefix: $CABALHOME" >> $CABALHOME/config
120− echo "repository hackage.haskell.org" >> $CABALHOME/config
121− echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
98+ echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
99+ echo "remote-build-reporting: anonymous" >> $CABALHOME/config
100+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
101+ echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
102+ echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
103+ echo "world-file: $CABALHOME/world" >> $CABALHOME/config
104+ echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
105+ echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
106+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
107+ echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
108+ echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
109+ echo "install-dirs user" >> $CABALHOME/config
110+ echo " prefix: $CABALHOME" >> $CABALHOME/config
111+ echo "repository hackage.haskell.org" >> $CABALHOME/config
112+ echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
113+ echo " secure: True" >> $CABALHOME/config
114+ echo " key-threshold: 3" >> $CABALHOME/config
115+ echo " root-keys:" >> $CABALHOME/config
116+ echo " fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >> $CABALHOME/config
117+ echo " 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >> $CABALHOME/config
118+ echo " 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >> $CABALHOME/config
119+ echo " 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >> $CABALHOME/config
120+ echo " 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >> $CABALHOME/config
122121 - GHCJOBS=-j2
123122 - |
124123 echo "program-default-options" >> $CABALHOME/config
@@ -343,5 +342,5 @@ script:
343342 - if ! $GHCJS ; then ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output ; fi
344343 - echo -en 'travis_fold:end:haddock\\r'
345344
346−# REGENDATA ["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"]
345+# REGENDATA ("0.7.20191106",["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"])
347346# EOF