ccf0056 · servant · git.iko.soy

git.iko.soy/servant

on master help sign in

Regenerate .travis.yml

ccf0056Oleg Grenrus9 years ago

.travis.yml+18−24

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' 'cabal.project'

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

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

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

13branches:

14 only:

15− - master

16 - release-0.12

15 - release-0.12

16+ - master

18cache:

19 directories:

@@ -40,15 +40,16 @@ matrix:

40 - compiler: "ghc-8.0.2"

41 # env: TEST=--disable-tests BENCH=--disable-benchmarks

42 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}

43− - compiler: "ghc-8.2.1"

43+ - compiler: "ghc-8.2.2"

44 # env: TEST=--disable-tests BENCH=--disable-benchmarks

45− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}}

45+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}

47before_install:

48 - HC=${CC}

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

50 - unset CC

51+ - ROOTDIR=$(pwd)

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

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

53install:

54install:

54 - cabal --version

55 - cabal --version

@@ -58,7 +59,7 @@ install:

58 - HADDOCK=${HADDOCK-true}

59 - HADDOCK=${HADDOCK-true}

59 - INSTALLED=${INSTALLED-true}

60 - INSTALLED=${INSTALLED-true}

60 - travis_retry cabal update -v

61 - travis_retry cabal update -v

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

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

62 - rm -fv cabal.project.local

63 - rm -fv cabal.project.local

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

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

64 (cd "servant"; autoreconf -i);

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

@@ -92,26 +93,21 @@ install:

92script:

93script:

93 # test that source-distributions can be generated

94 # test that source-distributions can be generated

94 - echo Packaging... && echo -en 'travis_fold:start:sdist\\r'

95 - echo Packaging... && echo -en 'travis_fold:start:sdist\\r'

95− - (cd "servant"; cabal sdist)

96+ - (cd "servant" && cabal sdist)

96− - (cd "servant-client"; cabal sdist)

97+ - (cd "servant-client" && cabal sdist)

97− - (cd "servant-client-core"; cabal sdist)

98+ - (cd "servant-client-core" && cabal sdist)

98− - (cd "servant-docs"; cabal sdist)

99+ - (cd "servant-docs" && cabal sdist)

99− - (cd "servant-foreign"; cabal sdist)

100+ - (cd "servant-foreign" && cabal sdist)

100− - (cd "servant-server"; cabal sdist)

101+ - (cd "servant-server" && cabal sdist)

101− - (cd "doc/tutorial"; cabal sdist)

102+ - (cd "doc/tutorial" && cabal sdist)

102 - echo -en 'travis_fold:end:sdist\\r'

103 - echo -en 'travis_fold:end:sdist\\r'

103 - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'

104 - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'

104 - mv "servant"/dist/servant-*.tar.gz "servant-client"/dist/servant-client-*.tar.gz "servant-client-core"/dist/servant-client-core-*.tar.gz "servant-docs"/dist/servant-docs-*.tar.gz "servant-foreign"/dist/servant-foreign-*.tar.gz "servant-server"/dist/servant-server-*.tar.gz "doc/tutorial"/dist/tutorial-*.tar.gz ${DISTDIR}/

105 - mv "servant"/dist/servant-*.tar.gz "servant-client"/dist/servant-client-*.tar.gz "servant-client-core"/dist/servant-client-core-*.tar.gz "servant-docs"/dist/servant-docs-*.tar.gz "servant-foreign"/dist/servant-foreign-*.tar.gz "servant-server"/dist/servant-server-*.tar.gz "doc/tutorial"/dist/tutorial-*.tar.gz ${DISTDIR}/

105− - cd ${DISTDIR}

106+ - cd ${DISTDIR} || false

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

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

107− - "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"

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"

108−

109 # Allow-newer and other cabal.project amendments

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

111−

112− # cryptonite

113− - "echo 'constraints: foundation >=0.0.14' >> cabal.project"

114−

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

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

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

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

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

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

@@ -120,9 +116,7 @@ script:

120

116

121 - echo Building with installed constraints for package in global-db... && echo -en 'travis_fold:start:build-installed\\r'

117 - echo Building with installed constraints for package in global-db... && echo -en 'travis_fold:start:build-installed\\r'

122 # Build with installed constraints for packages in global-db

118 # Build with installed constraints for packages in global-db

123− - if $INSTALLED; then

124− echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/$[a-zA-Z0-9-]\{1,\}$ */--constraint="\1 installed" /g') all | sh;

119+ - if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/$[a-zA-Z0-9-]\{1,\}$ */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi

125− else echo "Not building with installed constraints"; fi

126 - echo -en 'travis_fold:end:build-installed\\r'

120 - echo -en 'travis_fold:end:build-installed\\r'

127

121

128 - echo Building with tests and benchmarks... && echo -en 'travis_fold:start:build-everything\\r'

122 - echo Building with tests and benchmarks... && echo -en 'travis_fold:start:build-everything\\r'

@@ -139,5 +133,5 @@ script:

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

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

140

134

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

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

142−# REGENDATA ["-f","-o",".travis.yml","cabal.project"]

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

143# EOF

137# EOF

doc/tutorial/tutorial.cabal+1−1

@@ -12,7 +12,7 @@ tested-with:

12 GHC==7.8.4

13 GHC==7.10.3

14 GHC==8.0.2

15− GHC==8.2.1

15+ GHC==8.2.2

16extra-source-files:

17 static/index.html

18 static/ui.js

servant-client-core/servant-client-core.cabal+1−1

@@ -22,7 +22,7 @@ tested-with:

22 GHC==7.8.4

23 GHC==7.10.3

24 GHC==8.0.2

25− GHC==8.2.1

25+ GHC==8.2.2

27source-repository head

28 type: git

servant-client/servant-client.cabal+1−1

@@ -20,7 +20,7 @@ tested-with:

20 GHC==7.8.4

21 GHC==7.10.3

22 GHC==8.0.2

23− GHC==8.2.1

23+ GHC==8.2.2

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

25Bug-reports: http://github.com/haskell-servant/servant/issues

26extra-source-files:

servant-docs/servant-docs.cabal+1−1

@@ -19,7 +19,7 @@ tested-with:

19 GHC==7.8.4

20 GHC==7.10.3

21 GHC==8.0.2

22− GHC==8.2.1

22+ GHC==8.2.2

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

24Bug-reports: http://github.com/haskell-servant/servant/issues

25extra-source-files:

servant-foreign/servant-foreign.cabal+1−1

@@ -26,7 +26,7 @@ tested-with:

26 GHC==7.8.4

27 GHC==7.10.3

28 GHC==8.0.2

29− GHC==8.2.1

29+ GHC==8.2.2

31source-repository head

32 type: git

servant-server/servant-server.cabal+1−1

@@ -25,7 +25,7 @@ tested-with:

25 GHC==7.8.4

26 GHC==7.10.3

27 GHC==8.0.2

28− GHC==8.2.1

28+ GHC==8.2.2

29extra-source-files:

30 include/*.h

31 CHANGELOG.md

servant/servant.cabal+1−1

@@ -21,7 +21,7 @@ tested-with:

21 GHC==7.8.4

22 GHC==7.10.3

23 GHC==8.0.2

24− GHC==8.2.1

24+ GHC==8.2.2

25extra-source-files:

26 include/*.h

27 CHANGELOG.md