2dc48f0 · servant · git.iko.soy

git.iko.soy/servant

on master help sign in

Merge pull request #885 from phadej/travis-2018-01-05

2dc48f0Oleg Grenrus9 years ago

.travis.yml+34−18

compare with master

unifiedsplit

@@ -1,6 +1,6 @@

1# This Travis job script has been generated by a script via

3−# make_travis_yml_2.hs '-f' '-o' '.travis.yml' '--branch' 'master' '--branch' 'release-0.12' 'cabal.project'

3+# runghc make_travis_yml_2.hs '--config=cabal.make-travis-yml' '--output=.travis.yml' 'cabal.project'

5# For more information, see https://github.com/hvr/multi-ghc-travis

@@ -12,8 +12,8 @@ git:

13branches:

14 only:

15− - release-0.12

16 - master

15 - master

16+ - release-0.12

18cache:

19 directories:

@@ -29,6 +29,8 @@ before_cache:

29 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar

30 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx

32+ - rm -fv $HOME/.cabal/packages/head.hackage

33+

32matrix:

34matrix:

33 include:

35 include:

34 - compiler: "ghc-7.8.4"

36 - compiler: "ghc-7.8.4"

@@ -49,7 +51,10 @@ before_install:

49 - HCPKG=${HC/ghc/ghc-pkg}

51 - HCPKG=${HC/ghc/ghc-pkg}

50 - unset CC

52 - unset CC

51 - ROOTDIR=$(pwd)

53 - ROOTDIR=$(pwd)

54+ - mkdir -p $HOME/.local/bin

52− - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH"

55+ - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"

56+ - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))

57+ - echo $HCNUMVER

54install:

59install:

55 - cabal --version

60 - cabal --version

@@ -58,33 +63,34 @@ install:

58 - TEST=${TEST---enable-tests}

63 - TEST=${TEST---enable-tests}

59 - HADDOCK=${HADDOCK-true}

64 - HADDOCK=${HADDOCK-true}

60 - INSTALLED=${INSTALLED-true}

65 - INSTALLED=${INSTALLED-true}

66+ - GHCHEAD=${GHCHEAD-false}

61 - travis_retry cabal update -v

67 - travis_retry cabal update -v

62 - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"

68 - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"

63− - rm -fv cabal.project.local

69+ - rm -fv cabal.project cabal.project.local

70+ - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"

71+ - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'

64 - if [ -f "servant/configure.ac" ]; then

72 - if [ -f "servant/configure.ac" ]; then

65− (cd "servant"; autoreconf -i);

73+ (cd "servant" && autoreconf -i);

66 fi

74 fi

67 - if [ -f "servant-client/configure.ac" ]; then

75 - if [ -f "servant-client/configure.ac" ]; then

68− (cd "servant-client"; autoreconf -i);

76+ (cd "servant-client" && autoreconf -i);

69 fi

77 fi

70 - if [ -f "servant-client-core/configure.ac" ]; then

78 - if [ -f "servant-client-core/configure.ac" ]; then

71− (cd "servant-client-core"; autoreconf -i);

79+ (cd "servant-client-core" && autoreconf -i);

72 fi

80 fi

73 - if [ -f "servant-docs/configure.ac" ]; then

81 - if [ -f "servant-docs/configure.ac" ]; then

74− (cd "servant-docs"; autoreconf -i);

82+ (cd "servant-docs" && autoreconf -i);

75 fi

83 fi

76 - if [ -f "servant-foreign/configure.ac" ]; then

84 - if [ -f "servant-foreign/configure.ac" ]; then

77− (cd "servant-foreign"; autoreconf -i);

85+ (cd "servant-foreign" && autoreconf -i);

78 fi

86 fi

79 - if [ -f "servant-server/configure.ac" ]; then

87 - if [ -f "servant-server/configure.ac" ]; then

80− (cd "servant-server"; autoreconf -i);

88+ (cd "servant-server" && autoreconf -i);

81 fi

89 fi

82 - if [ -f "doc/tutorial/configure.ac" ]; then

90 - if [ -f "doc/tutorial/configure.ac" ]; then

83− (cd "doc/tutorial"; autoreconf -i);

91+ (cd "doc/tutorial" && autoreconf -i);

84 fi

92 fi

85 - rm -f cabal.project.freeze

93 - rm -f cabal.project.freeze

86− - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 servant-server servant-client

87− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 servant-server servant-client

88 - rm -rf "servant"/.ghc.environment.* "servant-client"/.ghc.environment.* "servant-client-core"/.ghc.environment.* "servant-docs"/.ghc.environment.* "servant-foreign"/.ghc.environment.* "servant-server"/.ghc.environment.* "doc/tutorial"/.ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist

94 - rm -rf "servant"/.ghc.environment.* "servant-client"/.ghc.environment.* "servant-client-core"/.ghc.environment.* "servant-docs"/.ghc.environment.* "servant-foreign"/.ghc.environment.* "servant-server"/.ghc.environment.* "doc/tutorial"/.ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist

89 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

95 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

@@ -106,8 +112,9 @@ script:

106 - cd ${DISTDIR} || false

112 - cd ${DISTDIR} || false

107 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;

113 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;

108 - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal\\n' > cabal.project"

114 - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal\\n' > cabal.project"

109− # Allow-newer and other cabal.project amendments

115+ - "echo 'constraints: foundation >=0.0.14' >> cabal.project"

110− - "echo 'allow-newer: servant-js:servant, servant-js:servant-foreign' >> cabal.project"

116+ - "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project"

117+ - cat cabal.project

111 - echo -en 'travis_fold:end:unpack\\r'

118 - echo -en 'travis_fold:end:unpack\\r'

112 - echo Building... && echo -en 'travis_fold:start:build\\r'

119 - echo Building... && echo -en 'travis_fold:start:build\\r'

113 # this builds all libraries and executables (without tests/benchmarks)

120 # this builds all libraries and executables (without tests/benchmarks)

@@ -123,15 +130,24 @@ script:

123 # build & run tests, build benchmarks

130 # build & run tests, build benchmarks

124 - cabal new-build -w ${HC} ${TEST} ${BENCH} all

131 - cabal new-build -w ${HC} ${TEST} ${BENCH} all

125 - echo -en 'travis_fold:end:build-everything\\r'

132 - echo -en 'travis_fold:end:build-everything\\r'

126− - echo Testing... && echo -en 'travis_fold:start:test\\r'

127 - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi

133 - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi

128− - echo -en 'travis_fold:end:test\\r'

129

134

135+ - echo cabal check... && echo -en 'travis_fold:start:check\\r'

136+ # cabal check

137+ - (cd servant-* && cabal check)

138+ - (cd servant-client-* && cabal check)

139+ - (cd servant-client-core-* && cabal check)

140+ - (cd servant-docs-* && cabal check)

141+ - (cd servant-foreign-* && cabal check)

142+ - (cd servant-server-* && cabal check)

143+ - (cd tutorial-* && cabal check)

144+

145+ - echo -en 'travis_fold:end:check\\r'

130 - echo Haddock... && echo -en 'travis_fold:start:haddock\\r'

146 - echo Haddock... && echo -en 'travis_fold:start:haddock\\r'

131 # haddock

147 # haddock

132 - rm -rf ./dist-newstyle

148 - rm -rf ./dist-newstyle

133 - if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi

149 - if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi

134

150

135 - echo -en 'travis_fold:end:haddock\\r'

151 - echo -en 'travis_fold:end:haddock\\r'

136−# REGENDATA ["-f","-o",".travis.yml","--branch","master","--branch","release-0.12","cabal.project"]

152+# REGENDATA ["--config=cabal.make-travis-yml","--output=.travis.yml","cabal.project"]

137# EOF

153# EOF

cabal.make-travis-ymlnew file+8

@@ -0,0 +1,8 @@

1+folds: all-but-test

2+branches: master release-0.12

4+-- We have inplace packages (servant-js) so we skip installing dependencies in a separate step

5+install-dependencies-step: False

7+-- ghc-options: -j2

8+jobs: :2

doc/tutorial/tutorial.cabal+4

@@ -1,7 +1,11 @@

1name: tutorial

2version: 0.10

3synopsis: The servant tutorial

4+description:

5+ The servant tutorial can be found at

6+ <http://haskell-servant.readthedocs.org/>

4homepage: http://haskell-servant.readthedocs.org/

7homepage: http://haskell-servant.readthedocs.org/

8+category: Servant, Documentation

5license: BSD3

9license: BSD3

6license-file: LICENSE

10license-file: LICENSE

7author: Servant Contributors

11author: Servant Contributors