git.iko.soy/typeable/openapi3
on master help sign in
Merge pull request #184 from GetShopTV/http-media-0.8
eaf9fc9Oleg Grenrus
.travis.yml+94−65
compare with master
unifiedsplit
@@ -1,24 +1,23 @@
1# This Travis job script has been generated by a script via
1# This Travis job script has been generated by a script via
2#
2#
3−# haskell-ci '--branches' 'master' '--haddock=>=8.4' '--output' '.travis.yml' 'swagger2.cabal'
3+# haskell-ci '--branches' 'master' '--haddock-jobs=>=8.4' '--output' '.travis.yml' 'swagger2.cabal'
4#
4#
5# For more information, see https://github.com/haskell-CI/haskell-ci
5# For more information, see https://github.com/haskell-CI/haskell-ci
6#
6#
7+# version: 0.3.20190413
8+#
7language: c
9language: c
8dist: xenial
10dist: xenial
9−
10git:
11git:
11− submodules: false # whether to recursively clone submodules
12+ # whether to recursively clone submodules
12−
13+ submodules: false
13branches:
14branches:
14 only:
15 only:
15 - master
16 - master
16−
17cache:
17cache:
18 directories:
18 directories:
19 - $HOME/.cabal/packages
19 - $HOME/.cabal/packages
20 - $HOME/.cabal/store
20 - $HOME/.cabal/store
21−
22before_cache:
21before_cache:
23 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
22 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
24 # remove files that are regenerated by 'cabal update'
23 # remove files that are regenerated by 'cabal update'
@@ -27,94 +26,124 @@ before_cache:
27 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
26 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
28 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
27 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
29 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
28 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
30−
31 - rm -rfv $CABALHOME/packages/head.hackage
29 - rm -rfv $CABALHOME/packages/head.hackage
32−
33matrix:
30matrix:
34 include:
31 include:
35− - compiler: "ghc-8.6.2"
32+ - compiler: ghc-8.6.4
36− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.2], sources: [hvr-ghc]}}
33+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.4","cabal-install-2.4"]}}
37− - compiler: "ghc-8.4.4"
34+ - compiler: ghc-8.4.4
38− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
35+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
39− - compiler: "ghc-8.2.2"
36+ - compiler: ghc-8.2.2
40− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
37+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
41− - compiler: "ghc-8.0.2"
38+ - compiler: ghc-8.0.2
42− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
39+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
43− - compiler: "ghc-7.10.3"
40+ - compiler: ghc-7.10.3
44− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
41+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}}
45− - compiler: "ghc-7.8.4"
42+ - compiler: ghc-7.8.4
46− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}}
43+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}}
47−
48before_install:
44before_install:
49− - HC=/opt/ghc/bin/${CC}
45+ - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
50− - HCPKG=${HC/ghc/ghc-pkg}
46+ - HCPKG="$HC-pkg"
51 - unset CC
47 - unset CC
52 - CABAL=/opt/ghc/bin/cabal
48 - CABAL=/opt/ghc/bin/cabal
53 - CABALHOME=$HOME/.cabal
49 - CABALHOME=$HOME/.cabal
54− - "export PATH=\"$CABALHOME/bin:$PATH\""
50+ - export PATH="$CABALHOME/bin:$PATH"
55− - ROOTDIR=$(pwd)
51+ - TOP=$(pwd)
56 - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
52 - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
57 - echo $HCNUMVER
53 - echo $HCNUMVER
58−
54+ - CABAL="$CABAL -vnormal+nowrap+markoutput"
55+ - set -o pipefail
56+ - |
57+ echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
58+ echo 'BEGIN { state = "output"; }' >> .colorful.awk
59+ echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
60+ echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
61+ echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
62+ echo ' if (state == "cabal") {' >> .colorful.awk
63+ echo ' print blue($0)' >> .colorful.awk
64+ echo ' } else {' >> .colorful.awk
65+ echo ' print $0' >> .colorful.awk
66+ echo ' }' >> .colorful.awk
67+ echo '}' >> .colorful.awk
68+ - cat .colorful.awk
69+ - |
70+ color_cabal_output () {
71+ awk -f $TOP/.colorful.awk
72+ }
73+ - echo text | color_cabal_output
59install:
74install:
60 - ${CABAL} --version
75 - ${CABAL} --version
61 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
76 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
62 - TEST=--enable-tests
77 - TEST=--enable-tests
63 - BENCH=--enable-benchmarks
78 - BENCH=--enable-benchmarks
64 - GHCHEAD=${GHCHEAD-false}
79 - GHCHEAD=${GHCHEAD-false}
80+ - rm -f $CABALHOME/config
81+ - |
82+ echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
83+ echo "remote-build-reporting: anonymous" >> $CABALHOME/config
84+ echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
85+ echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
86+ echo "world-file: $CABALHOME/world" >> $CABALHOME/config
87+ echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
88+ echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
89+ echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
90+ echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
91+ echo "install-dirs user" >> $CABALHOME/config
92+ echo " prefix: $CABALHOME" >> $CABALHOME/config
93+ echo "repository hackage.haskell.org" >> $CABALHOME/config
94+ echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
95+ - cat $CABALHOME/config
96+ - rm -fv cabal.project cabal.project.local cabal.project.freeze
65− - travis_retry ${CABAL} update -v
97+ - travis_retry ${CABAL} v2-update -v
66− - "sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config"
98+ # Generate cabal.project
67− - rm -fv cabal.project cabal.project.local
99+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
68− - grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$'
69− - rm -f cabal.project
70 - touch cabal.project
100 - touch cabal.project
101+ - |
71− - "printf 'packages: \".\"\\n' >> cabal.project"
102+ echo 'packages: "."' >> cabal.project
103+ - |
72− - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
104+ echo "write-ghc-environment-files: always" >> cabal.project
73− - touch cabal.project.local
74 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(swagger2)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
105 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(swagger2)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
75 - cat cabal.project || true
106 - cat cabal.project || true
76 - cat cabal.project.local || true
107 - cat cabal.project.local || true
77 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
108 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
78− - rm -f cabal.project.freeze
79− - ${CABAL} new-freeze -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dry
109+ - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
80− - "cat \"cabal.project.freeze\" | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
110+ - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
81− - rm "cabal.project.freeze"
111+ - rm cabal.project.freeze
82− - ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
112+ - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
83− - ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
113+ - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
84− - rm -rf .ghc.environment.* "."/dist
85− - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
86−
87−# Here starts the actual work to be performed for the package under test;
88−# any command which exits with a non-zero exit code causes the build to fail.
89script:
114script:
90− # test that source-distributions can be generated
115+ - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
116+ # Packaging...
91− - ${CABAL} new-sdist all
117+ - ${CABAL} v2-sdist all | color_cabal_output
118+ # Unpacking...
92 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
119 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
93 - cd ${DISTDIR} || false
120 - cd ${DISTDIR} || false
94 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
121 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
122+ # Generate cabal.project
95− - rm -f cabal.project
123+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
96 - touch cabal.project
124 - touch cabal.project
125+ - |
97− - "printf 'packages: \"swagger2-*/*.cabal\"\\n' >> cabal.project"
126+ echo 'packages: "swagger2-*/*.cabal"' >> cabal.project
127+ - |
98− - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
128+ echo "write-ghc-environment-files: always" >> cabal.project
99− - touch cabal.project.local
100 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(swagger2)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
129 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(swagger2)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
101 - cat cabal.project || true
130 - cat cabal.project || true
102 - cat cabal.project.local || true
131 - cat cabal.project.local || true
132+ # Building...
103 # this builds all libraries and executables (without tests/benchmarks)
133 # this builds all libraries and executables (without tests/benchmarks)
104− - ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all
134+ - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
105−
135+ # Building with tests and benchmarks...
106 # build & run tests, build benchmarks
136 # build & run tests, build benchmarks
107− - ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all
137+ - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
138+ # Testing...
108− - if [ "x$TEST" = "x--enable-tests" ]; then ${CABAL} new-test -w ${HC} ${TEST} ${BENCH} all; fi
139+ - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
109−
110− # ${CABAL} check
140+ # cabal check...
111− - (cd swagger2-* && ${CABAL} check)
141+ - (cd swagger2-* && ${CABAL} -vnormal check)
112−
113− # haddock
142+ # haddock...
114− - if [ $HCNUMVER -ge 80400 ] ; then ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all ; fi
143+ - if [ $HCNUMVER -ge 80400 ] ; then ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output ; fi
115−
116− # Build without installed constraints for packages in global-db
144+ # Building without installed constraints for packages in global-db...
145+ - rm -f cabal.project.local
117− - rm -f cabal.project.local; ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all;
146+ - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
118
147
119−# REGENDATA ["--branches","master","--haddock=>=8.4","--output",".travis.yml","swagger2.cabal"]
148+# REGENDATA ["--branches","master","--haddock-jobs=>=8.4","--output",".travis.yml","swagger2.cabal"]
120# EOF
149# EOF
swagger2.cabal+4−4
@@ -29,7 +29,7 @@ tested-with:
29 || ==8.0.2
29 || ==8.0.2
30 || ==8.2.2
30 || ==8.2.2
31 || ==8.4.4
31 || ==8.4.4
32− || ==8.6.2
32+ || ==8.6.4
33
33
34custom-setup
34custom-setup
35 setup-depends:
35 setup-depends:
@@ -79,7 +79,7 @@ library
79 , cookie >=0.4.3 && <0.5
79 , cookie >=0.4.3 && <0.5
80 , generics-sop >=0.3.2.0 && <0.5
80 , generics-sop >=0.3.2.0 && <0.5
81 , hashable >=1.2.7.0 && <1.3
81 , hashable >=1.2.7.0 && <1.3
82− , http-media >=0.7.1.2 && <0.8
82+ , http-media >=0.7.1.2 && <0.9
83 , insert-ordered-containers >=0.2.1.0 && <0.3
83 , insert-ordered-containers >=0.2.1.0 && <0.3
84 , lens >=4.16.1 && <4.18
84 , lens >=4.16.1 && <4.18
85 , network >=2.6.3.5 && <3.1
85 , network >=2.6.3.5 && <3.1
@@ -88,7 +88,7 @@ library
88 , unordered-containers >=0.2.9.0 && <0.3
88 , unordered-containers >=0.2.9.0 && <0.3
89 , uuid-types >=1.0.3 && <1.1
89 , uuid-types >=1.0.3 && <1.1
90 , vector >=0.12.0.1 && <0.13
90 , vector >=0.12.0.1 && <0.13
91− , QuickCheck >=2.10.1 && <2.13
91+ , QuickCheck >=2.10.1 && <2.14
92
92
93 default-language: Haskell2010
93 default-language: Haskell2010
94
94
@@ -115,12 +115,12 @@ test-suite spec
115 , time
115 , time
116 , unordered-containers
116 , unordered-containers
117 , vector
117 , vector
118+ , QuickCheck
118
119
119 -- test-suite only dependencies
120 -- test-suite only dependencies
120 build-depends:
121 build-depends:
121 hspec >=2.5.5 && <2.8
122 hspec >=2.5.5 && <2.8
122 , HUnit >=1.6.0.0 && <1.7
123 , HUnit >=1.6.0.0 && <1.7
123− , QuickCheck >=2.11.3 && <2.13
124 , quickcheck-instances >=0.3.19 && <0.14
124 , quickcheck-instances >=0.3.19 && <0.14
125 , utf8-string >=1.0.1.1 && <1.1
125 , utf8-string >=1.0.1.1 && <1.1
126
126