git.iko.soy/typeable/postgresql-simple
on master help sign in
GHC-9.8 support
f5b4316Oleg Grenrus
.github/workflows/haskell-ci.yml+22−15
compare with master
unifiedsplit
@@ -8,9 +8,9 @@
8#
8#
9# For more information, see https://github.com/haskell-CI/haskell-ci
9# For more information, see https://github.com/haskell-CI/haskell-ci
10#
10#
11−# version: 0.16.6
11+# version: 0.17.20231110
12#
12#
13−# REGENDATA ("0.16.6",["github","cabal.project"])
13+# REGENDATA ("0.17.20231110",["github","cabal.project"])
14#
14#
15name: Haskell-CI
15name: Haskell-CI
16on:
16on:
@@ -38,14 +38,19 @@ jobs:
38 strategy:
38 strategy:
39 matrix:
39 matrix:
40 include:
40 include:
41− - compiler: ghc-9.6.2
41+ - compiler: ghc-9.8.1
42 compilerKind: ghc
42 compilerKind: ghc
43− compilerVersion: 9.6.2
43+ compilerVersion: 9.8.1
44 setup-method: ghcup
44 setup-method: ghcup
45 allow-failure: false
45 allow-failure: false
46− - compiler: ghc-9.4.5
46+ - compiler: ghc-9.6.3
47 compilerKind: ghc
47 compilerKind: ghc
48− compilerVersion: 9.4.5
48+ compilerVersion: 9.6.3
49+ setup-method: ghcup
50+ allow-failure: false
51+ - compiler: ghc-9.4.8
52+ compilerKind: ghc
53+ compilerVersion: 9.4.8
49 setup-method: ghcup
54 setup-method: ghcup
50 allow-failure: false
55 allow-failure: false
51 - compiler: ghc-9.2.8
56 - compiler: ghc-9.2.8
@@ -81,18 +86,18 @@ jobs:
81 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
86 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
82 if [ "${{ matrix.setup-method }}" = ghcup ]; then
87 if [ "${{ matrix.setup-method }}" = ghcup ]; then
83 mkdir -p "$HOME/.ghcup/bin"
88 mkdir -p "$HOME/.ghcup/bin"
84− curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
89+ curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
85 chmod a+x "$HOME/.ghcup/bin/ghcup"
90 chmod a+x "$HOME/.ghcup/bin/ghcup"
86 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
91 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
87− "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
92+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
88 else
93 else
89 apt-add-repository -y 'ppa:hvr/ghc'
94 apt-add-repository -y 'ppa:hvr/ghc'
90 apt-get update
95 apt-get update
91 apt-get install -y "$HCNAME"
96 apt-get install -y "$HCNAME"
92 mkdir -p "$HOME/.ghcup/bin"
97 mkdir -p "$HOME/.ghcup/bin"
93− curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
98+ curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
94 chmod a+x "$HOME/.ghcup/bin/ghcup"
99 chmod a+x "$HOME/.ghcup/bin/ghcup"
95− "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
96 fi
101 fi
97 env:
102 env:
98 HCKIND: ${{ matrix.compilerKind }}
103 HCKIND: ${{ matrix.compilerKind }}
@@ -106,17 +111,19 @@ jobs:
106 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
111 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
107 HCDIR=/opt/$HCKIND/$HCVER
112 HCDIR=/opt/$HCKIND/$HCVER
108 if [ "${{ matrix.setup-method }}" = ghcup ]; then
113 if [ "${{ matrix.setup-method }}" = ghcup ]; then
109− HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
114+ HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
115+ HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
116+ HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
110 echo "HC=$HC" >> "$GITHUB_ENV"
117 echo "HC=$HC" >> "$GITHUB_ENV"
111− echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
118+ echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
112− echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
119+ echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
113− echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
120+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
114 else
121 else
115 HC=$HCDIR/bin/$HCKIND
122 HC=$HCDIR/bin/$HCKIND
116 echo "HC=$HC" >> "$GITHUB_ENV"
123 echo "HC=$HC" >> "$GITHUB_ENV"
117 echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
124 echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
118 echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
125 echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
119− echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
126+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
120 fi
127 fi
121
128
122 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
129 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
.github/workflows/simple.yml+2−2
@@ -14,7 +14,7 @@ jobs:
14 strategy:
14 strategy:
15 matrix:
15 matrix:
16 os: [macos-latest, windows-latest]
16 os: [macos-latest, windows-latest]
17− ghc: ['8.10','9.0','9.2','9.4.5','9.6.2']
17+ ghc: ['8.10','9.0','9.2','9.4.8','9.6.3','9.8.1']
18 fail-fast: false
18 fail-fast: false
19 timeout-minutes:
19 timeout-minutes:
20 60
20 60
@@ -29,7 +29,7 @@ jobs:
29 uses: haskell/actions/setup@v2
29 uses: haskell/actions/setup@v2
30 with:
30 with:
31 ghc-version: ${{ matrix.ghc }}
31 ghc-version: ${{ matrix.ghc }}
32− cabal-version: '3.10.1.0'
32+ cabal-version: '3.10.2.0'
33
33
34 - name: Set up PostgreSQL
34 - name: Set up PostgreSQL
35 uses: ikalnytskyi/action-setup-postgres@v3
35 uses: ikalnytskyi/action-setup-postgres@v3
postgresql-simple.cabal+8−6
@@ -1,6 +1,7 @@
1cabal-version: 1.12
1cabal-version: 1.12
2name: postgresql-simple
2name: postgresql-simple
3version: 0.7.0.0
3version: 0.7.0.0
4+x-revision: 1
4synopsis: Mid-Level PostgreSQL client library
5synopsis: Mid-Level PostgreSQL client library
5description:
6description:
6 Mid-Level PostgreSQL client library, forked from mysql-simple.
7 Mid-Level PostgreSQL client library, forked from mysql-simple.
@@ -28,8 +29,9 @@ tested-with:
28 || ==8.10.7
29 || ==8.10.7
29 || ==9.0.2
30 || ==9.0.2
30 || ==9.2.8
31 || ==9.2.8
31− || ==9.4.5
32+ || ==9.4.8
32− || ==9.6.2
33+ || ==9.6.3
34+ || ==9.8.1
33
35
34library
36library
35 default-language: Haskell2010
37 default-language: Haskell2010
@@ -75,11 +77,11 @@ library
75
77
76 -- GHC bundled libs
78 -- GHC bundled libs
77 build-depends:
79 build-depends:
78− base >=4.12.0.0 && <4.19
80+ base >=4.12.0.0 && <4.20
79− , bytestring >=0.10.8.2 && <0.12
81+ , bytestring >=0.10.8.2 && <0.13
80 , containers >=0.6.0.1 && <0.7
82 , containers >=0.6.0.1 && <0.7
81− , template-haskell >=2.14.0.0 && <2.21
83+ , template-haskell >=2.14.0.0 && <2.22
82− , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
84+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
83 , time-compat >=1.9.5 && <1.12
85 , time-compat >=1.9.5 && <1.12
84 , transformers >=0.5.6.2 && <0.7
86 , transformers >=0.5.6.2 && <0.7
85
87