b3be592 · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

on master help sign in

Allow base-4.15

b3be592Oleg Grenrus6 years ago

.github/workflows/haskell-ci.yml+17−9

compare with master

unifiedsplit

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

1# This GitHub workflow config has been generated by a script via

3−# haskell-ci 'github' 'postgresql-simple.cabal'

3+# haskell-ci 'github' 'cabal.project'

5# To regenerate the script (for example after adjusting tested-with) run

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

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

10#

11−# version: 0.11.20210101

11+# version: 0.11.20210220

12#

13−# REGENDATA ("0.11.20210101",["github","postgresql-simple.cabal"])

13+# REGENDATA ("0.11.20210220",["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 - GHC ${{ matrix.ghc }}

26 runs-on: ubuntu-18.04

27 container:

28 image: buildpack-deps:bionic

@@ -36,7 +36,9 @@ jobs:

36 strategy:

37 matrix:

38 include:

39− - ghc: 8.10.3

39+ - ghc: 9.0.1

40+ allow-failure: false

41+ - ghc: 8.10.4

40 allow-failure: false

42 allow-failure: false

41 - ghc: 8.8.4

43 - ghc: 8.8.4

42 allow-failure: false

44 allow-failure: false

@@ -62,7 +64,7 @@ jobs:

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

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

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

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

64 apt-get update

66 apt-get update

65− apt-get install -y ghc-$GHC_VERSION cabal-install-3.2

67+ apt-get install -y ghc-$GHC_VERSION cabal-install-3.4

66 env:

68 env:

67 GHC_VERSION: ${{ matrix.ghc }}

69 GHC_VERSION: ${{ matrix.ghc }}

68 - name: Set PATH and environment variables

70 - name: Set PATH and environment variables

@@ -75,12 +77,13 @@ jobs:

75 echo "HC=$HC" >> $GITHUB_ENV

77 echo "HC=$HC" >> $GITHUB_ENV

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

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

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

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

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

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

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

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

80 echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV

82 echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV

81 echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

83 echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV

82 echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV

84 echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV

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

83− echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV

86+ echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV

84 echo "GHCJSARITH=0" >> $GITHUB_ENV

87 echo "GHCJSARITH=0" >> $GITHUB_ENV

85 env:

88 env:

86 GHC_VERSION: ${{ matrix.ghc }}

89 GHC_VERSION: ${{ matrix.ghc }}

@@ -128,10 +131,14 @@ jobs:

128 uses: actions/checkout@v2

131 uses: actions/checkout@v2

129 with:

132 with:

130 path: source

133 path: source

134+ - name: initial cabal.project for sdist

135+ run: |

136+ touch cabal.project

137+ echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project

138+ cat cabal.project

131 - name: sdist

139 - name: sdist

132 run: |

140 run: |

133 mkdir -p sdist

141 mkdir -p sdist

134− cd source || false

135 $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist

142 $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist

136 - name: unpack

143 - name: unpack

137 run: |

144 run: |

@@ -147,6 +154,7 @@ jobs:

147 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package postgresql-simple" >> cabal.project ; fi

154 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package postgresql-simple" >> cabal.project ; fi

148 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi

155 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi

149 cat >> cabal.project <<EOF

156 cat >> cabal.project <<EOF

157+ allow-newer: cryptohash-md5-0.11.100.1:base

150 EOF

158 EOF

151 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(postgresql-simple)$/; }' >> cabal.project.local

159 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(postgresql-simple)$/; }' >> cabal.project.local

152 cat cabal.project

160 cat cabal.project

cabal.project+2

@@ -1,2 +1,4 @@

1packages: .

2tests: true

4+allow-newer: cryptohash-md5-0.11.100.1:base

postgresql-simple.cabal+4−3

@@ -31,7 +31,8 @@ tested-with:

31 || ==8.4.4

32 || ==8.6.5

33 || ==8.8.4

34− || ==8.10.3

34+ || ==8.10.4

35+ || ==9.0.1

36library

37library

37 default-language: Haskell2010

38 default-language: Haskell2010

@@ -77,10 +78,10 @@ library

78 -- GHC bundled libs

79 -- GHC bundled libs

79 build-depends:

80 build-depends:

80− base >=4.6.0.0 && <4.15

81+ base >=4.6.0.0 && <4.16

81 , bytestring >=0.10.0.0 && <0.12

82 , bytestring >=0.10.0.0 && <0.12

82 , containers >=0.5.0.0 && <0.7

83 , containers >=0.5.0.0 && <0.7

83− , template-haskell >=2.8.0.0 && <2.17

84+ , template-haskell >=2.8.0.0 && <2.18

84 , text >=1.2.3.0 && <1.3

85 , text >=1.2.3.0 && <1.3

85 , time-compat >=1.9.5 && <1.12

86 , time-compat >=1.9.5 && <1.12

86 , transformers >=0.3.0.0 && <0.6

87 , transformers >=0.3.0.0 && <0.6