06a7521 · typeable/yaml

git.iko.soy/typeable/yaml

CI upgrade

commit06a7521ce7b7c68f36f72c2c230d981d1dee2aaa authorMichael Snoyman <michael@snoyman.com> dateThu 28 Jun 2018, 12:09 (8 years ago) parent6d7a3c8

3 files changed+66−48

compare with master

unifiedsplit

.travis.yml+44−40 appveyor.yml+19−7 yaml.cabal+3−1

.travis.yml+44−40

@@ -20,6 +20,7 @@ cache:

2020 - $HOME/.ghc

2121 - $HOME/.cabal

2222 - $HOME/.stack

23+ - $TRAVIS_BUILD_DIR/.stack-work

2324

2425# The different configurations we want to test. We have BUILD=cabal which uses

2526# cabal-install, and BUILD=stack which uses Stack. More documentation on each

@@ -44,21 +45,24 @@ matrix:

4445 #- env: BUILD=cabal GHCVER=7.4.2 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7

4546 # compiler: ": #GHC 7.4.2"

4647 # addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}

47− - env: BUILD=cabal GHCVER=7.6.3 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7

48− compiler: ": #GHC 7.6.3"

49− addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}

50− - env: BUILD=cabal GHCVER=7.8.4 CABALVER=1.18 HAPPYVER=1.19.5 ALEXVER=3.1.7

51− compiler: ": #GHC 7.8.4"

52− addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}

53− - env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22 HAPPYVER=1.19.5 ALEXVER=3.1.7

54− compiler: ": #GHC 7.10.3"

55− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}

48+ #- env: BUILD=cabal GHCVER=7.6.3 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7

49+ # compiler: ": #GHC 7.6.3"

50+ # addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}

51+ #- env: BUILD=cabal GHCVER=7.8.4 CABALVER=1.18 HAPPYVER=1.19.5 ALEXVER=3.1.7

52+ # compiler: ": #GHC 7.8.4"

53+ # addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}

54+ #- env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22 HAPPYVER=1.19.5 ALEXVER=3.1.7

55+ # compiler: ": #GHC 7.10.3"

56+ # addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}

5657 - env: BUILD=cabal GHCVER=8.0.2 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7

5758 compiler: ": #GHC 8.0.2"

5859 addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}

5960 - env: BUILD=cabal GHCVER=8.2.2 CABALVER=2.0 HAPPYVER=1.19.5 ALEXVER=3.1.7

6061 compiler: ": #GHC 8.2.2"

6162 addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}

63+ - env: BUILD=cabal GHCVER=8.4.3 CABALVER=2.2 HAPPYVER=1.19.5 ALEXVER=3.1.7

64+ compiler: ": #GHC 8.4.3"

65+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}

6266

6367 # Build with the newest GHC and cabal-install. This is an accepted failure,

6468 # see below.

@@ -72,27 +76,27 @@ matrix:

7276 compiler: ": #stack default"

7377 addons: {apt: {packages: [libgmp-dev]}}

7478

75− - env: BUILD=stack ARGS="--resolver lts-2"

76− compiler: ": #stack 7.8.4"

77− addons: {apt: {packages: [libgmp-dev]}}

79+ #- env: BUILD=stack ARGS="--resolver lts-2"

80+ # compiler: ": #stack 7.8.4"

81+ # addons: {apt: {packages: [libgmp-dev]}}

7882

79− - env: BUILD=stack ARGS="--resolver lts-3"

80− compiler: ": #stack 7.10.2"

81− addons: {apt: {packages: [libgmp-dev]}}

83+ #- env: BUILD=stack ARGS="--resolver lts-3"

84+ # compiler: ": #stack 7.10.2"

85+ # addons: {apt: {packages: [libgmp-dev]}}

8286

83− - env: BUILD=stack ARGS="--resolver lts-6"

84− compiler: ": #stack 7.10.3"

85− addons: {apt: {packages: [libgmp-dev]}}

87+ #- env: BUILD=stack ARGS="--resolver lts-6"

88+ # compiler: ": #stack 7.10.3"

89+ # addons: {apt: {packages: [libgmp-dev]}}

8690

87− - env: BUILD=stack ARGS="--resolver lts-7"

88− compiler: ": #stack 8.0.1"

89− addons: {apt: {packages: [libgmp-dev]}}

91+ #- env: BUILD=stack ARGS="--resolver lts-7"

92+ # compiler: ": #stack 8.0.1"

93+ # addons: {apt: {packages: [libgmp-dev]}}

9094

9195 - env: BUILD=stack ARGS="--resolver lts-9"

9296 compiler: ": #stack 8.0.2"

9397 addons: {apt: {packages: [libgmp-dev]}}

9498

95− - env: BUILD=stack ARGS="--resolver lts-10"

99+ - env: BUILD=stack ARGS="--resolver lts-11"

96100 compiler: ": #stack 8.2.2"

97101 addons: {apt: {packages: [libgmp-dev]}}

98102

@@ -111,23 +115,23 @@ matrix:

111115 # compiler: ": #stack 7.8.4 osx"

112116 # os: osx

113117

114− - env: BUILD=stack ARGS="--resolver lts-3"

115− compiler: ": #stack 7.10.2 osx"

116− os: osx

118+ #- env: BUILD=stack ARGS="--resolver lts-3"

119+ # compiler: ": #stack 7.10.2 osx"

120+ # os: osx

117121

118− - env: BUILD=stack ARGS="--resolver lts-6"

119− compiler: ": #stack 7.10.3 osx"

120− os: osx

122+ #- env: BUILD=stack ARGS="--resolver lts-6"

123+ # compiler: ": #stack 7.10.3 osx"

124+ # os: osx

121125

122− - env: BUILD=stack ARGS="--resolver lts-7"

123− compiler: ": #stack 8.0.1 osx"

124− os: osx

126+ #- env: BUILD=stack ARGS="--resolver lts-7"

127+ # compiler: ": #stack 8.0.1 osx"

128+ # os: osx

125129

126130 - env: BUILD=stack ARGS="--resolver lts-9"

127131 compiler: ": #stack 8.0.2 osx"

128132 os: osx

129133

130− - env: BUILD=stack ARGS="--resolver lts-10"

134+ - env: BUILD=stack ARGS="--resolver lts-11"

131135 compiler: ": #stack 8.2.2 osx"

132136 os: osx

133137

@@ -153,9 +157,9 @@ before_install:

153157- |

154158 if [ `uname` = "Darwin" ]

155159 then

156− travis_retry curl --insecure -L https://www.stackage.org/stack/osx-x86_64 | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin

160+ travis_retry curl --insecure -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin

157161 else

158− travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'

162+ travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'

159163 fi

160164

161165 # Use the more reliable S3 mirror of Hackage

@@ -163,10 +167,6 @@ before_install:

163167 echo 'remote-repo: hackage.haskell.org:http://hackage.fpcomplete.com/' > $HOME/.cabal/config

164168 echo 'remote-repo-cache: $HOME/.cabal/packages' >> $HOME/.cabal/config

165169

166− if [ "$CABALVER" != "1.16" ]

167− then

168− echo 'jobs: $ncpus' >> $HOME/.cabal/config

169− fi

170170

171171install:

172172- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"

@@ -218,9 +218,13 @@ script:

218218 cd dist

219219 tar zxfv "$SRC_TGZ"

220220 cd "$PKGVER"

221− cabal configure --enable-tests

221+ cabal configure --enable-tests --ghc-options -O0

222222 cabal build

223− cabal test

223+ if [ "$CABALVER" = "1.16" ] || [ "$CABALVER" = "1.18" ]; then

224+ cabal test

225+ else

226+ cabal test --show-details=streaming --log=/dev/stdout

227+ fi

224228 cd $ORIGDIR

225229 done

226230 ;;

appveyor.yml+19−7

@@ -1,11 +1,10 @@

1−# Disabled cache in hope of improving reliability of AppVeyor builds

2−#cache:

3−#- "c:\\sr" # stack root, short paths == fewer problems

4−

51build: off

73before_test:

8−- curl -sS -ostack.zip -L --insecure http://www.stackage.org/stack/windows-i386

4+# http://help.appveyor.com/discussions/problems/6312-curl-command-not-found

5+- set PATH=C:\Program Files\Git\mingw64\bin;%PATH%

7+- curl -sS -ostack.zip -L --insecure https://get.haskellstack.org/stable/windows-x86_64.zip

98- 7z x stack.zip stack.exe

109

1110clone_folder: "c:\\stack"

@@ -13,8 +12,21 @@ environment:

1312 global:

1413 STACK_ROOT: "c:\\sr"

1514

15+ matrix:

16+ - ARGS: ""

17+ #- ARGS: "--resolver lts-2"

18+ #- ARGS: "--resolver lts-3"

19+ #- ARGS: "--resolver lts-6"

20+ #- ARGS: "--resolver lts-7"

21+ - ARGS: "--resolver lts-9"

22+ - ARGS: "--resolver lts-11"

23+ #- ARGS: "--resolver nightly"

24+

1625test_script:

17−- stack setup > nul

26+

27+# Install toolchain, but do it silently due to lots of output

28+- stack %ARGS% setup > nul

29+

1830# The ugly echo "" hack is to avoid complaints about 0 being an invalid file

1931# descriptor

20−- echo "" | stack --no-terminal test

32+- echo "" | stack %ARGS% --no-terminal test --pedantic

yaml.cabal+3−1

@@ -46,7 +46,9 @@ flag no-unicode

4646

4747library

4848 other-extensions: LambdaCase

49− build-depends: base >= 4 && < 5

49+ if impl(ghc < 8.0.2)

50+ buildable: False

51+ build-depends: base >= 4.9.1 && < 5

5052 , transformers >= 0.1

5153 , bytestring >= 0.9.1.4

5254 , conduit >= 1.2.8 && < 1.4