Skip to content

Commit f190aa5

Browse files
stepcutstepcut
committed
0.23.12.4 - loosen build depends
1 parent c6abde8 commit f190aa5

3 files changed

Lines changed: 47 additions & 29 deletions

File tree

‎.github/workflows/haskell-ci.yml‎

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.14.3
11+
# version: 0.17.20240109
1212
#
13-
# REGENDATA ("0.14.3",["github","web-routes-happstack.cabal"])
13+
# REGENDATA ("0.17.20240109",["github","web-routes-happstack.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
linux:
2121
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22-
runs-on: ubuntu-18.04
22+
runs-on: ubuntu-20.04
2323
timeout-minutes:
2424
60
2525
container:
@@ -28,9 +28,19 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.4.3
31+
- compiler: ghc-9.8.1
3232
compilerKind: ghc
33-
compilerVersion: 9.4.3
33+
compilerVersion: 9.8.1
34+
setup-method: ghcup
35+
allow-failure: false
36+
- compiler: ghc-9.6.4
37+
compilerKind: ghc
38+
compilerVersion: 9.6.4
39+
setup-method: ghcup
40+
allow-failure: false
41+
- compiler: ghc-9.4.8
42+
compilerKind: ghc
43+
compilerVersion: 9.4.8
3444
setup-method: ghcup
3545
allow-failure: false
3646
- compiler: ghc-9.2.5
@@ -81,18 +91,18 @@ jobs:
8191
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8292
if [ "${{ matrix.setup-method }}" = ghcup ]; then
8393
mkdir -p "$HOME/.ghcup/bin"
84-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
94+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
8595
chmod a+x "$HOME/.ghcup/bin/ghcup"
86-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
87-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
96+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
97+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8898
else
8999
apt-add-repository -y 'ppa:hvr/ghc'
90100
apt-get update
91101
apt-get install -y "$HCNAME"
92102
mkdir -p "$HOME/.ghcup/bin"
93-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
103+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
94104
chmod a+x "$HOME/.ghcup/bin/ghcup"
95-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
105+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
96106
fi
97107
env:
98108
HCKIND: ${{ matrix.compilerKind }}
@@ -106,17 +116,19 @@ jobs:
106116
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
107117
HCDIR=/opt/$HCKIND/$HCVER
108118
if [ "${{ matrix.setup-method }}" = ghcup ]; then
109-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
119+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
120+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
121+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
110122
echo "HC=$HC" >> "$GITHUB_ENV"
111-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
112-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
113-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
123+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
124+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
125+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
114126
else
115127
HC=$HCDIR/bin/$HCKIND
116128
echo "HC=$HC" >> "$GITHUB_ENV"
117129
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
118130
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
119-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
131+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
120132
fi
121133
122134
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -168,14 +180,14 @@ jobs:
168180
- name: install cabal-plan
169181
run: |
170182
mkdir -p $HOME/.cabal/bin
171-
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
172-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
183+
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
184+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
173185
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
174186
rm -f cabal-plan.xz
175187
chmod a+x $HOME/.cabal/bin/cabal-plan
176188
cabal-plan --version
177189
- name: checkout
178-
uses: actions/checkout@v2
190+
uses: actions/checkout@v3
179191
with:
180192
path: source
181193
- name: initial cabal.project for sdist
@@ -210,8 +222,8 @@ jobs:
210222
run: |
211223
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
212224
cabal-plan
213-
- name: cache
214-
uses: actions/cache@v2
225+
- name: restore cache
226+
uses: actions/cache/restore@v3
215227
with:
216228
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
217229
path: ~/.cabal/store
@@ -232,8 +244,14 @@ jobs:
232244
${CABAL} -vnormal check
233245
- name: haddock
234246
run: |
235-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
247+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
236248
- name: unconstrained build
237249
run: |
238250
rm -f cabal.project.local
239251
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
252+
- name: save cache
253+
uses: actions/cache/save@v3
254+
if: always()
255+
with:
256+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
257+
path: ~/.cabal/store

‎shell.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ let
55
inherit (nixpkgs) pkgs;
66

77
f = { mkDerivation, base, bytestring, happstack-server, stdenv
8-
, text, web-routes
8+
, text, web-routes, cabal-install
99
}:
1010
mkDerivation {
1111
pname = "web-routes-happstack";
1212
version = "0.23.10";
1313
src = ./.;
1414
libraryHaskellDepends = [
15-
base bytestring happstack-server text web-routes
15+
base bytestring happstack-server text cabal-install
1616
];
1717
description = "Adds support for using web-routes with Happstack";
1818
license = stdenv.lib.licenses.bsd3;

‎web-routes-happstack.cabal‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
Name: web-routes-happstack
2-
Version: 0.23.12.3
2+
Version: 0.23.12.4
33
License: BSD3
44
License-File: LICENSE
55
Author: jeremy@seereason.com
66
Maintainer: partners@seereason.com
7-
Bug-Reports: http://bugzilla.seereason.com/
7+
Bug-Reports: https://github.com/Happstack/web-routes-happstack/issues
88
Category: Web, Language
99
Synopsis: Adds support for using web-routes with Happstack
1010
Description: Added Happstack class instances for RouteT. Provides a default router for Site.
1111
Cabal-Version: >= 1.10
1212
Build-type: Simple
13-
tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.1, GHC==8.6.5, GHC==8.8.4, GHC==8.10.7, GHC==9.0.2, GHC==9.2.5, GHC==9.4.3
13+
tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.1, GHC==8.6.5, GHC==8.8.4, GHC==8.10.7, GHC==9.0.2, GHC==9.2.5, GHC==9.4.8, GHC==9.6.4, GHC==9.8.1
1414

1515
Library
1616
Default-language: Haskell2010
1717
Build-Depends: base >= 4 && < 5,
18-
bytestring >= 0.9 && < 0.12,
19-
happstack-server >= 6.6 && < 7.9,
20-
text >= 0.11 && < 2.1,
18+
bytestring >= 0.9 && < 0.13,
19+
happstack-server >= 6.6 && < 7.10,
20+
text >= 0.11 && < 2.2,
2121
web-routes >= 0.27.1 && < 0.28
2222
Exposed-Modules: Web.Routes.Happstack
2323

0 commit comments

Comments
 (0)