561d254 · typeable/http-api-data

git.iko.soy/typeable/http-api-data

on master help sign in

Merge pull request #113 from fizruk/base-compat-0.12-transformers-0.6

561d254Oleg Grenrus5 years ago

.github/workflows/haskell-ci.yml+68−34

compare with master

unifiedsplit

@@ -8,9 +8,9 @@

9# For more information, see https://github.com/haskell-CI/haskell-ci

10#

11−# version: 0.11.20210220

11+# version: 0.13.20210827

12#

13−# REGENDATA ("0.11.20210220",["github","cabal.project"])

13+# REGENDATA ("0.13.20210827",["github","cabal.project"])

14#

15name: Haskell-CI

16on:

@@ -22,7 +22,7 @@ on:

22 - master

23jobs:

24 linux:

25− name: Haskell-CI - Linux - GHC ${{ matrix.ghc }}

25+ name: Haskell-CI - Linux - ${{ matrix.compiler }}

26 runs-on: ubuntu-18.04

27 container:

28 image: buildpack-deps:bionic

@@ -30,55 +30,87 @@ jobs:

30 strategy:

31 matrix:

32 include:

33− - ghc: 9.0.1

33+ - compiler: ghc-9.0.1

34+ compilerKind: ghc

35+ compilerVersion: 9.0.1

36+ setup-method: hvr-ppa

34 allow-failure: false

37 allow-failure: false

35− - ghc: 8.10.4

38+ - compiler: ghc-8.10.4

39+ compilerKind: ghc

40+ compilerVersion: 8.10.4

41+ setup-method: hvr-ppa

36 allow-failure: false

42 allow-failure: false

37− - ghc: 8.8.4

43+ - compiler: ghc-8.8.4

44+ compilerKind: ghc

45+ compilerVersion: 8.8.4

46+ setup-method: hvr-ppa

38 allow-failure: false

47 allow-failure: false

39− - ghc: 8.6.5

48+ - compiler: ghc-8.6.5

49+ compilerKind: ghc

50+ compilerVersion: 8.6.5

51+ setup-method: hvr-ppa

40 allow-failure: false

52 allow-failure: false

41− - ghc: 8.4.4

53+ - compiler: ghc-8.4.4

54+ compilerKind: ghc

55+ compilerVersion: 8.4.4

56+ setup-method: hvr-ppa

42 allow-failure: false

57 allow-failure: false

43− - ghc: 8.2.2

58+ - compiler: ghc-8.2.2

59+ compilerKind: ghc

60+ compilerVersion: 8.2.2

61+ setup-method: hvr-ppa

44 allow-failure: false

62 allow-failure: false

45− - ghc: 8.0.2

63+ - compiler: ghc-8.0.2

64+ compilerKind: ghc

65+ compilerVersion: 8.0.2

66+ setup-method: hvr-ppa

46 allow-failure: false

67 allow-failure: false

47− - ghc: 7.10.3

68+ - compiler: ghc-7.10.3

69+ compilerKind: ghc

70+ compilerVersion: 7.10.3

71+ setup-method: hvr-ppa

48 allow-failure: false

72 allow-failure: false

49− - ghc: 7.8.4

73+ - compiler: ghc-7.8.4

74+ compilerKind: ghc

75+ compilerVersion: 7.8.4

76+ setup-method: hvr-ppa

50 allow-failure: false

77 allow-failure: false

51 fail-fast: false

78 fail-fast: false

52 steps:

79 steps:

53 - name: apt

80 - name: apt

54 run: |

81 run: |

55 apt-get update

82 apt-get update

56− apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common

83+ apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5

57 apt-add-repository -y 'ppa:hvr/ghc'

84 apt-add-repository -y 'ppa:hvr/ghc'

58 apt-get update

85 apt-get update

59− apt-get install -y ghc-$GHC_VERSION cabal-install-3.4

86+ apt-get install -y "$HCNAME" cabal-install-3.4

60 env:

87 env:

61− GHC_VERSION: ${{ matrix.ghc }}

88+ HCKIND: ${{ matrix.compilerKind }}

89+ HCNAME: ${{ matrix.compiler }}

90+ HCVER: ${{ matrix.compilerVersion }}

62 - name: Set PATH and environment variables

91 - name: Set PATH and environment variables

63 run: |

92 run: |

64 echo "$HOME/.cabal/bin" >> $GITHUB_PATH

93 echo "$HOME/.cabal/bin" >> $GITHUB_PATH

65− echo "LANG=C.UTF-8" >> $GITHUB_ENV

94+ echo "LANG=C.UTF-8" >> "$GITHUB_ENV"

66− echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV

95+ echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"

67− echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV

96+ echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"

68− HC=/opt/ghc/$GHC_VERSION/bin/ghc

97+ HCDIR=/opt/$HCKIND/$HCVER

98+ HC=$HCDIR/bin/$HCKIND

69− echo "HC=$HC" >> $GITHUB_ENV

99+ echo "HC=$HC" >> "$GITHUB_ENV"

70− echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV

100+ echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"

71− echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV

101+ echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"

72− echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV

102+ echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> "$GITHUB_ENV"

73 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

103 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

74− echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV

104+ echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

75− echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

105+ echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

76− echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV

106+ echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"

77− echo "HEADHACKAGE=false" >> $GITHUB_ENV

107+ echo "HEADHACKAGE=false" >> "$GITHUB_ENV"

78− echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV

108+ echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"

79− echo "GHCJSARITH=0" >> $GITHUB_ENV

109+ echo "GHCJSARITH=0" >> "$GITHUB_ENV"

80 env:

110 env:

81− GHC_VERSION: ${{ matrix.ghc }}

111+ HCKIND: ${{ matrix.compilerKind }}

112+ HCNAME: ${{ matrix.compiler }}

113+ HCVER: ${{ matrix.compilerVersion }}

82 - name: env

114 - name: env

83 run: |

115 run: |

84 env

116 env

@@ -113,7 +145,7 @@ jobs:

113 - name: cache (tools)

145 - name: cache (tools)

114 uses: actions/cache@v2

146 uses: actions/cache@v2

115 with:

147 with:

116− key: ${{ runner.os }}-${{ matrix.ghc }}-tools-0d2d184d

148+ key: ${{ runner.os }}-${{ matrix.compiler }}-tools-13a8fe6d

117 path: ~/.haskell-ci-tools

149 path: ~/.haskell-ci-tools

118 - name: install cabal-plan

150 - name: install cabal-plan

119 run: |

151 run: |

@@ -148,7 +180,8 @@ jobs:

148 - name: generate cabal.project

180 - name: generate cabal.project

149 run: |

181 run: |

150 PKGDIR_http_api_data="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/http-api-data-[0-9.]*')"

182 PKGDIR_http_api_data="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/http-api-data-[0-9.]*')"

151− echo "PKGDIR_http_api_data=${PKGDIR_http_api_data}" >> $GITHUB_ENV

183+ echo "PKGDIR_http_api_data=${PKGDIR_http_api_data}" >> "$GITHUB_ENV"

184+ rm -f cabal.project cabal.project.local

152 touch cabal.project

185 touch cabal.project

153 touch cabal.project.local

186 touch cabal.project.local

154 echo "packages: ${PKGDIR_http_api_data}" >> cabal.project

187 echo "packages: ${PKGDIR_http_api_data}" >> cabal.project

@@ -166,9 +199,9 @@ jobs:

166 - name: cache

199 - name: cache

167 uses: actions/cache@v2

200 uses: actions/cache@v2

168 with:

201 with:

169− key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}

202+ key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

170 path: ~/.cabal/store

203 path: ~/.cabal/store

171− restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-

204+ restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-

172 - name: install dependencies

205 - name: install dependencies

173 run: |

206 run: |

174 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all

207 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all

@@ -203,4 +236,5 @@ jobs:

203 rm -f cabal.project.local

236 rm -f cabal.project.local

204 - name: constraint set text-show

237 - name: constraint set text-show

205 run: |

238 run: |

239+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' --dependencies-only -j2 all

206 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all

240 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all

http-api-data.cabal+3−3

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

1cabal-version: >= 1.10

2name: http-api-data

3version: 0.4.3

4−x-revision: 2

4+x-revision: 3

6synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.

7category: Web

@@ -49,7 +49,7 @@ library

49 , bytestring >= 0.10.4.0 && < 0.12

50 , containers >= 0.5.5.1 && < 0.7

51 , text >= 1.2.3.0 && < 1.3

52− , transformers >= 0.3 && < 0.6

52+ , transformers >= 0.3 && < 0.7

54 -- so Semigroup Builder exists

55 if impl(ghc >= 8.0)

@@ -59,7 +59,7 @@ library

59 build-depends:

60 attoparsec >= 0.13.2.2 && < 0.15

61 , attoparsec-iso8601 >= 1.0.2.0 && < 1.1

62− , base-compat >= 0.10.5 && < 0.12

62+ , base-compat >= 0.10.5 && < 0.13

63 , cookie >= 0.4.3 && < 0.5

64 , hashable >= 1.2.7.0 && < 1.4

65 , http-types >= 0.12.3 && < 0.13