Skip to content

Commit 9d19a54

Browse files
stepcutstepcut
committed
another attempt to fix the github actions
1 parent 4386bab commit 9d19a54

1 file changed

Lines changed: 42 additions & 53 deletions

File tree

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

Lines changed: 42 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,28 @@
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-tls.cabal"])
13+
# REGENDATA ("0.17.20231012",["github","happstack-server-tls.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
17-
- push
18-
- pull_request
17+
push:
18+
branches:
19+
- master
20+
pull_request:
21+
branches:
22+
- master
1923
jobs:
2024
linux:
2125
name: Haskell-CI - Linux - ${{ matrix.compiler }}
2226
runs-on: ubuntu-20.04
2327
timeout-minutes:
2428
60
2529
container:
26-
image: buildpack-deps:bionic
30+
image: buildpack-deps:focal
2731
continue-on-error: ${{ matrix.allow-failure }}
2832
strategy:
2933
matrix:
@@ -38,19 +42,19 @@ jobs:
3842
compilerVersion: 9.8.2
3943
setup-method: ghcup
4044
allow-failure: false
41-
- compiler: ghc-9.6.4
45+
- compiler: ghc-9.6.3
4246
compilerKind: ghc
43-
compilerVersion: 9.6.4
47+
compilerVersion: 9.6.3
4448
setup-method: ghcup
4549
allow-failure: false
46-
- compiler: ghc-9.4.8
50+
- compiler: ghc-9.4.7
4751
compilerKind: ghc
48-
compilerVersion: 9.4.8
52+
compilerVersion: 9.4.7
4953
setup-method: ghcup
5054
allow-failure: false
51-
- compiler: ghc-9.2.5
55+
- compiler: ghc-9.2.8
5256
compilerKind: ghc
53-
compilerVersion: 9.2.5
57+
compilerVersion: 9.2.8
5458
setup-method: ghcup
5559
allow-failure: false
5660
- compiler: ghc-9.0.2
@@ -66,49 +70,40 @@ jobs:
6670
- compiler: ghc-8.8.4
6771
compilerKind: ghc
6872
compilerVersion: 8.8.4
69-
setup-method: hvr-ppa
73+
setup-method: ghcup
7074
allow-failure: false
7175
- compiler: ghc-8.6.5
7276
compilerKind: ghc
7377
compilerVersion: 8.6.5
74-
setup-method: hvr-ppa
78+
setup-method: ghcup
7579
allow-failure: false
7680
- compiler: ghc-8.4.4
7781
compilerKind: ghc
7882
compilerVersion: 8.4.4
79-
setup-method: hvr-ppa
83+
setup-method: ghcup
8084
allow-failure: false
8185
- compiler: ghc-8.2.2
8286
compilerKind: ghc
8387
compilerVersion: 8.2.2
84-
setup-method: hvr-ppa
88+
setup-method: ghcup
8589
allow-failure: false
8690
- compiler: ghc-8.0.2
8791
compilerKind: ghc
8892
compilerVersion: 8.0.2
89-
setup-method: hvr-ppa
93+
setup-method: ghcup
9094
allow-failure: false
9195
fail-fast: false
9296
steps:
9397
- name: apt
9498
run: |
9599
apt-get update
96-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
97-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
98-
mkdir -p "$HOME/.ghcup/bin"
99-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
100-
chmod a+x "$HOME/.ghcup/bin/ghcup"
101-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
102-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
103-
else
104-
apt-add-repository -y 'ppa:hvr/ghc'
105-
apt-get update
106-
apt-get install -y "$HCNAME"
107-
mkdir -p "$HOME/.ghcup/bin"
108-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
109-
chmod a+x "$HOME/.ghcup/bin/ghcup"
110-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
111-
fi
100+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
101+
mkdir -p "$HOME/.ghcup/bin"
102+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
103+
chmod a+x "$HOME/.ghcup/bin/ghcup"
104+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
105+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
106+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
112107
env:
113108
HCKIND: ${{ matrix.compilerKind }}
114109
HCNAME: ${{ matrix.compiler }}
@@ -120,22 +115,13 @@ jobs:
120115
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
121116
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
122117
HCDIR=/opt/$HCKIND/$HCVER
123-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
124-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
125-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
126-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
127-
echo "HC=$HC" >> "$GITHUB_ENV"
128-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
129-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
130-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
131-
else
132-
HC=$HCDIR/bin/$HCKIND
133-
echo "HC=$HC" >> "$GITHUB_ENV"
134-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
135-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
136-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
137-
fi
138-
118+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
119+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
120+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
121+
echo "HC=$HC" >> "$GITHUB_ENV"
122+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
123+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
124+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
139125
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
140126
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
141127
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -212,12 +198,12 @@ jobs:
212198
find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
213199
- name: generate cabal.project
214200
run: |
215-
PKGDIR_happstack_server_tls="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/happstack-server-tls-[0-9.]*')"
216-
echo "PKGDIR_happstack_server_tls=${PKGDIR_happstack_server_tls}" >> "$GITHUB_ENV"
201+
PKGDIR_happstack_server="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/happstack-server-tls-[0-9.]*')"
202+
echo "PKGDIR_happstack_server=${PKGDIR_happstack_server}" >> "$GITHUB_ENV"
217203
rm -f cabal.project cabal.project.local
218204
touch cabal.project
219205
touch cabal.project.local
220-
echo "packages: ${PKGDIR_happstack_server_tls}" >> cabal.project
206+
echo "packages: ${PKGDIR_happstack_server}" >> cabal.project
221207
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package happstack-server-tls" >> cabal.project ; fi
222208
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
223209
cat >> cabal.project <<EOF
@@ -245,9 +231,12 @@ jobs:
245231
- name: build
246232
run: |
247233
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
234+
- name: tests
235+
run: |
236+
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
248237
- name: cabal check
249238
run: |
250-
cd ${PKGDIR_happstack_server_tls} || false
239+
cd ${PKGDIR_happstack_server} || false
251240
${CABAL} -vnormal check
252241
- name: haddock
253242
run: |

0 commit comments

Comments
 (0)