Skip to content

Commit 5364169

Browse files
ulysses4everulysses4ever
authored
Compatibilty with GHC-9.4 (#284)
Bumps `base` and CI
1 parent 6bd1ffe commit 5364169

File tree

11 files changed

+37
-240
lines changed

11 files changed

+37
-240
lines changed

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

Lines changed: 19 additions & 12 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.1
11+
# version: 0.15.20220812
1212
#
13-
# REGENDATA ("0.14.1",["github","cabal.project"])
13+
# REGENDATA ("0.15.20220812",["github","cabal.project"])
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,14 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.2.1
31+
- compiler: ghc-9.4.1
3232
compilerKind: ghc
33-
compilerVersion: 9.2.1
33+
compilerVersion: 9.4.1
34+
setup-method: ghcup
35+
allow-failure: false
36+
- compiler: ghc-9.2.4
37+
compilerKind: ghc
38+
compilerVersion: 9.2.4
3439
setup-method: ghcup
3540
allow-failure: false
3641
- compiler: ghc-9.0.2
@@ -96,18 +101,19 @@ jobs:
96101
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
97102
if [ "${{ matrix.setup-method }}" = ghcup ]; then
98103
mkdir -p "$HOME/.ghcup/bin"
99-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
104+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
100105
chmod a+x "$HOME/.ghcup/bin/ghcup"
101-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
102-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
106+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
107+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
108+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
103109
else
104110
apt-add-repository -y 'ppa:hvr/ghc'
105111
apt-get update
106112
apt-get install -y "$HCNAME"
107113
mkdir -p "$HOME/.ghcup/bin"
108-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
114+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
109115
chmod a+x "$HOME/.ghcup/bin/ghcup"
110-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
116+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
111117
fi
112118
env:
113119
HCKIND: ${{ matrix.compilerKind }}
@@ -138,7 +144,7 @@ jobs:
138144
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
139145
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
140146
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
141-
if [ $((HCNUMVER > 90201)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
147+
if [ $((HCNUMVER > 90401)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
142148
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
143149
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
144150
env:
@@ -176,6 +182,7 @@ jobs:
176182
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
177183
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
178184
key-threshold: 3
185+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
179186
EOF
180187
fi
181188
cat >> $CABAL_CONFIG <<EOF
@@ -312,7 +319,7 @@ jobs:
312319
${CABAL} -vnormal check
313320
- name: haddock
314321
run: |
315-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
322+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
316323
- name: unconstrained build
317324
run: |
318325
rm -f cabal.project.local

‎.github/workflows/haskell.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
ghc: ['9.2.1', '9.0.2', '8.10.7']
12+
ghc: ['9.4.1', '9.2.4', '9.0.2', '8.10.7']
1313
os: [ubuntu-latest, macOS-latest, windows-latest]
1414
steps:
1515
- uses: actions/checkout@v2
1616
- uses: haskell/actions/setup@v1
1717
with:
1818
ghc-version: ${{ matrix.ghc }}
19-
cabal-version: '3.6.2.0'
19+
cabal-version: '3.8.1.0'
2020

2121
- name: Cache
2222
uses: actions/cache@v1

‎.travis.yml‎

Lines changed: 0 additions & 210 deletions
This file was deleted.

‎example-client/example-client.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build-type: Simple
1212
cabal-version: >=1.10
1313

1414
tested-with:
15-
GHC==9.2.1, GHC==9.0.2,
15+
GHC==9.4.1, GHC==9.2.4, GHC==9.0.2,
1616
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
1717
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
1818

@@ -29,7 +29,7 @@ executable example-client
2929
main-is: Main.hs
3030
other-modules: Prelude ExampleClient.Options
3131

32-
build-depends: base >= 4.5 && < 4.17,
32+
build-depends: base >= 4.5 && < 4.18,
3333
bytestring >= 0.9,
3434
directory >= 1.1,
3535
filepath >= 1.2,

‎hackage-repo-tool/hackage-repo-tool.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ homepage: https://github.com/haskell/hackage-security
2323
bug-reports: https://github.com/haskell/hackage-security/issues
2424

2525
tested-with:
26-
GHC==9.2.1, GHC==9.0.2,
26+
GHC==9.4.1, GHC==9.2.4, GHC==9.0.2,
2727
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
2828
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
2929

@@ -59,7 +59,7 @@ executable hackage-repo-tool
5959

6060
-- For boot libraries we try to accomodate the versions bundled with
6161
-- the respective GHC release
62-
build-depends: base >= 4.5 && < 4.17,
62+
build-depends: base >= 4.5 && < 4.18,
6363
bytestring >= 0.9 && < 0.12,
6464
directory >= 1.1 && < 1.4,
6565
filepath >= 1.3 && < 1.5,

‎hackage-root-tool/hackage-root-tool.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ build-type: Simple
1616
cabal-version: >=1.10
1717

1818
tested-with:
19-
GHC==9.2.1, GHC==9.0.2,
19+
GHC==9.4.1, GHC==9.2.4, GHC==9.0.2,
2020
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
2121
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
2222

0 commit comments

Comments
 (0)