Skip to content

Commit cc69751

Browse files
stepcutstepcut
committed
export runWebT
1 parent 825aa64 commit cc69751

2 files changed

Lines changed: 29 additions & 49 deletions

File tree

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

Lines changed: 28 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# haskell-ci regenerate
88
#
9-
# For more information, see https://github.com/haskell-CI/haskell-ci
9+
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.18.1
11+
# version: 0.17.20231012
1212
#
13-
# REGENDATA ("0.18.1",["github","happstack-server.cabal"])
13+
# REGENDATA ("0.17.20231012",["github","happstack-server.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -27,19 +27,14 @@ jobs:
2727
timeout-minutes:
2828
60
2929
container:
30-
image: buildpack-deps:bionic
30+
image: buildpack-deps:focal
3131
continue-on-error: ${{ matrix.allow-failure }}
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.10.1
35+
- compiler: ghc-9.8.1
3636
compilerKind: ghc
37-
compilerVersion: 9.10.2
38-
setup-method: ghcup
39-
allow-failure: false
40-
- compiler: ghc-9.8.2
41-
compilerKind: ghc
42-
compilerVersion: 9.8.2
37+
compilerVersion: 9.8.1
4338
setup-method: ghcup
4439
allow-failure: false
4540
- compiler: ghc-9.6.3
@@ -70,49 +65,40 @@ jobs:
7065
- compiler: ghc-8.8.4
7166
compilerKind: ghc
7267
compilerVersion: 8.8.4
73-
setup-method: hvr-ppa
68+
setup-method: ghcup
7469
allow-failure: false
7570
- compiler: ghc-8.6.5
7671
compilerKind: ghc
7772
compilerVersion: 8.6.5
78-
setup-method: hvr-ppa
73+
setup-method: ghcup
7974
allow-failure: false
8075
- compiler: ghc-8.4.4
8176
compilerKind: ghc
8277
compilerVersion: 8.4.4
83-
setup-method: hvr-ppa
78+
setup-method: ghcup
8479
allow-failure: false
8580
- compiler: ghc-8.2.2
8681
compilerKind: ghc
8782
compilerVersion: 8.2.2
88-
setup-method: hvr-ppa
83+
setup-method: ghcup
8984
allow-failure: false
9085
- compiler: ghc-8.0.2
9186
compilerKind: ghc
9287
compilerVersion: 8.0.2
93-
setup-method: hvr-ppa
88+
setup-method: ghcup
9489
allow-failure: false
9590
fail-fast: false
9691
steps:
9792
- name: apt
9893
run: |
9994
apt-get update
100-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
101-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
102-
mkdir -p "$HOME/.ghcup/bin"
103-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
104-
chmod a+x "$HOME/.ghcup/bin/ghcup"
105-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
106-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
107-
else
108-
apt-add-repository -y 'ppa:hvr/ghc'
109-
apt-get update
110-
apt-get install -y "$HCNAME"
111-
mkdir -p "$HOME/.ghcup/bin"
112-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
113-
chmod a+x "$HOME/.ghcup/bin/ghcup"
114-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
115-
fi
95+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
96+
mkdir -p "$HOME/.ghcup/bin"
97+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
98+
chmod a+x "$HOME/.ghcup/bin/ghcup"
99+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
100+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
101+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
116102
env:
117103
HCKIND: ${{ matrix.compilerKind }}
118104
HCNAME: ${{ matrix.compiler }}
@@ -124,22 +110,13 @@ jobs:
124110
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
125111
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
126112
HCDIR=/opt/$HCKIND/$HCVER
127-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
128-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
129-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
130-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
131-
echo "HC=$HC" >> "$GITHUB_ENV"
132-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
133-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
134-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
135-
else
136-
HC=$HCDIR/bin/$HCKIND
137-
echo "HC=$HC" >> "$GITHUB_ENV"
138-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
139-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
140-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
141-
fi
142-
113+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
114+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
115+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
116+
echo "HC=$HC" >> "$GITHUB_ENV"
117+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
118+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
119+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
143120
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
144121
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
145122
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -196,9 +173,11 @@ jobs:
196173
chmod a+x $HOME/.cabal/bin/cabal-plan
197174
cabal-plan --version
198175
- name: checkout
199-
uses: actions/checkout@v3
176+
uses: actions/checkout@v4
200177
with:
201178
path: source
179+
env:
180+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
202181
- name: initial cabal.project for sdist
203182
run: |
204183
touch cabal.project

‎src/Happstack/Server/SimpleHTTP.hs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ module Happstack.Server.SimpleHTTP
4444
, bindPort
4545
, bindIPv4
4646
, parseConfig
47+
, runWebT
4748
, waitForTermination
4849
-- * Re-exported modules
4950
-- ** Basic ServerMonad functionality

0 commit comments

Comments
 (0)