git.iko.soy/typeable/http-api-data
on master help sign in
Allow transformers-0.6 and base-compat-0.12
commitef80ab32b5a5d1d3649bccd5c6cdc867f12fddd2 authorOleg Grenrus <oleg.grenrus@iki.fi> dateMon 30 Aug 2021, 23:40 (5 years ago) parentcb47123
2 files changed+71−37
.github/workflows/haskell-ci.yml+68−34 http-api-data.cabal+3−3
.github/workflows/haskell-ci.yml+68−34
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.11.20210220
11+# version: 0.13.20210827
1212#
13−# REGENDATA ("0.11.20210220",["github","cabal.project"])
13+# REGENDATA ("0.13.20210827",["github","cabal.project"])
1414#
1515name: Haskell-CI
1616on:
@@ -22,7 +22,7 @@ on:
2222 - master
2323jobs:
2424 linux:
25− name: Haskell-CI - Linux - GHC ${{ matrix.ghc }}
25+ name: Haskell-CI - Linux - ${{ matrix.compiler }}
2626 runs-on: ubuntu-18.04
2727 container:
2828 image: buildpack-deps:bionic
@@ -30,55 +30,87 @@ jobs:
3030 strategy:
3131 matrix:
3232 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
3437 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
3642 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
3847 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
4052 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
4257 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
4462 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
4667 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
4872 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
5077 allow-failure: false
5178 fail-fast: false
5279 steps:
5380 - name: apt
5481 run: |
5582 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
5784 apt-add-repository -y 'ppa:hvr/ghc'
5885 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
6087 env:
61− GHC_VERSION: ${{ matrix.ghc }}
88+ HCKIND: ${{ matrix.compilerKind }}
89+ HCNAME: ${{ matrix.compiler }}
90+ HCVER: ${{ matrix.compilerVersion }}
6291 - name: Set PATH and environment variables
6392 run: |
6493 echo "$HOME/.cabal/bin" >> $GITHUB_PATH
65− echo "LANG=C.UTF-8" >> $GITHUB_ENV
66− echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV
67− echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV
68− HC=/opt/ghc/$GHC_VERSION/bin/ghc
69− echo "HC=$HC" >> $GITHUB_ENV
70− echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
71− echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
72− echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
94+ echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
95+ echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
96+ echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
97+ HCDIR=/opt/$HCKIND/$HCVER
98+ HC=$HCDIR/bin/$HCKIND
99+ echo "HC=$HC" >> "$GITHUB_ENV"
100+ echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
101+ echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
102+ echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> "$GITHUB_ENV"
73103 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
75− echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
76− echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
77− echo "HEADHACKAGE=false" >> $GITHUB_ENV
78− echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
79− echo "GHCJSARITH=0" >> $GITHUB_ENV
104+ echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
105+ echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
106+ echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
107+ echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
108+ echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
109+ echo "GHCJSARITH=0" >> "$GITHUB_ENV"
80110 env:
81− GHC_VERSION: ${{ matrix.ghc }}
111+ HCKIND: ${{ matrix.compilerKind }}
112+ HCNAME: ${{ matrix.compiler }}
113+ HCVER: ${{ matrix.compilerVersion }}
82114 - name: env
83115 run: |
84116 env
@@ -113,7 +145,7 @@ jobs:
113145 - name: cache (tools)
114146 uses: actions/cache@v2
115147 with:
116− key: ${{ runner.os }}-${{ matrix.ghc }}-tools-0d2d184d
148+ key: ${{ runner.os }}-${{ matrix.compiler }}-tools-13a8fe6d
117149 path: ~/.haskell-ci-tools
118150 - name: install cabal-plan
119151 run: |
@@ -148,7 +180,8 @@ jobs:
148180 - name: generate cabal.project
149181 run: |
150182 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
152185 touch cabal.project
153186 touch cabal.project.local
154187 echo "packages: ${PKGDIR_http_api_data}" >> cabal.project
@@ -166,9 +199,9 @@ jobs:
166199 - name: cache
167200 uses: actions/cache@v2
168201 with:
169− key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
202+ key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
170203 path: ~/.cabal/store
171− restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
204+ restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
172205 - name: install dependencies
173206 run: |
174207 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
@@ -203,4 +236,5 @@ jobs:
203236 rm -f cabal.project.local
204237 - name: constraint set text-show
205238 run: |
239+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' --dependencies-only -j2 all
206240 $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 @@
11cabal-version: >= 1.10
22name: http-api-data
33version: 0.4.3
4−x-revision: 2
4+x-revision: 3
55
66synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.
77category: Web
@@ -49,7 +49,7 @@ library
4949 , bytestring >= 0.10.4.0 && < 0.12
5050 , containers >= 0.5.5.1 && < 0.7
5151 , text >= 1.2.3.0 && < 1.3
52− , transformers >= 0.3 && < 0.6
52+ , transformers >= 0.3 && < 0.7
5353
5454 -- so Semigroup Builder exists
5555 if impl(ghc >= 8.0)
@@ -59,7 +59,7 @@ library
5959 build-depends:
6060 attoparsec >= 0.13.2.2 && < 0.15
6161 , attoparsec-iso8601 >= 1.0.2.0 && < 1.1
62− , base-compat >= 0.10.5 && < 0.12
62+ , base-compat >= 0.10.5 && < 0.13
6363 , cookie >= 0.4.3 && < 0.5
6464 , hashable >= 1.2.7.0 && < 1.4
6565 , http-types >= 0.12.3 && < 0.13