Skip to content

Commit 78601e4

Browse files
phadejphadej
authored
Merge pull request #60 from haskellari/ghc-9.8
Support GHC-9.8
2 parents c9872cf + f0b1385 commit 78601e4

File tree

2 files changed

+39
-20
lines changed

2 files changed

+39
-20
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 28 additions & 17 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.15.20230313
11+
# version: 0.17.20231010
1212
#
13-
# REGENDATA ("0.15.20230313",["github","cabal.project"])
13+
# REGENDATA ("0.17.20231010",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,19 +32,24 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.6.1
35+
- compiler: ghc-9.8.1
3636
compilerKind: ghc
37-
compilerVersion: 9.6.1
37+
compilerVersion: 9.8.1
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.4.4
40+
- compiler: ghc-9.6.3
4141
compilerKind: ghc
42-
compilerVersion: 9.4.4
42+
compilerVersion: 9.6.3
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.2.7
45+
- compiler: ghc-9.4.7
4646
compilerKind: ghc
47-
compilerVersion: 9.2.7
47+
compilerVersion: 9.4.7
48+
setup-method: ghcup
49+
allow-failure: false
50+
- compiler: ghc-9.2.8
51+
compilerKind: ghc
52+
compilerVersion: 9.2.8
4853
setup-method: ghcup
4954
allow-failure: false
5055
- compiler: ghc-9.0.2
@@ -75,7 +80,7 @@ jobs:
7580
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
7681
if [ "${{ matrix.setup-method }}" = ghcup ]; then
7782
mkdir -p "$HOME/.ghcup/bin"
78-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
83+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
7984
chmod a+x "$HOME/.ghcup/bin/ghcup"
8085
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
8186
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
@@ -84,7 +89,7 @@ jobs:
8489
apt-get update
8590
apt-get install -y "$HCNAME"
8691
mkdir -p "$HOME/.ghcup/bin"
87-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
92+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
8893
chmod a+x "$HOME/.ghcup/bin/ghcup"
8994
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9095
fi
@@ -100,10 +105,12 @@ jobs:
100105
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
101106
HCDIR=/opt/$HCKIND/$HCVER
102107
if [ "${{ matrix.setup-method }}" = ghcup ]; then
103-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
108+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
109+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
110+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
104111
echo "HC=$HC" >> "$GITHUB_ENV"
105-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
106-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
112+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
113+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
107114
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
108115
else
109116
HC=$HCDIR/bin/$HCKIND
@@ -162,17 +169,17 @@ jobs:
162169
- name: install cabal-plan
163170
run: |
164171
mkdir -p $HOME/.cabal/bin
165-
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
166-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
172+
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
173+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
167174
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
168175
rm -f cabal-plan.xz
169176
chmod a+x $HOME/.cabal/bin/cabal-plan
170177
cabal-plan --version
171178
- name: install cabal-docspec
172179
run: |
173180
mkdir -p $HOME/.cabal/bin
174-
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20211114/cabal-docspec-0.0.0.20211114.xz > cabal-docspec.xz
175-
echo 'e224700d9e8c9ec7ec6bc3f542ba433cd9925a5d356676c62a9bd1f2c8be8f8a cabal-docspec.xz' | sha256sum -c -
181+
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20230517/cabal-docspec-0.0.0.20230517-x86_64-linux.xz > cabal-docspec.xz
182+
echo '3b31bbe463ad4d671abbc103db49628562ec48a6604cab278207b5b6acd21ed7 cabal-docspec.xz' | sha256sum -c -
176183
xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
177184
rm -f cabal-docspec.xz
178185
chmod a+x $HOME/.cabal/bin/cabal-docspec
@@ -252,10 +259,14 @@ jobs:
252259
rm -f cabal.project.local
253260
- name: constraint set unsafe
254261
run: |
262+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='some +newtype-unsafe' all --dry-run
263+
cabal-plan topo | sort
255264
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='some +newtype-unsafe' --dependencies-only -j2 all
256265
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='some +newtype-unsafe' all
257266
- name: constraint set safe
258267
run: |
268+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='some -newtype-unsafe' all --dry-run
269+
cabal-plan topo | sort
259270
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='some -newtype-unsafe' --dependencies-only -j2 all
260271
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='some -newtype-unsafe' all
261272
- name: save cache

‎some.cabal

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: some
22
version: 1.0.5
3+
x-revision: 1
34
cabal-version: >=1.10
45
build-type: Simple
56
author:
@@ -24,7 +25,14 @@ description:
2425
If you are unsure which variant to use, use the one in "Data.Some" module.
2526

2627
tested-with:
27-
GHC ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.2 || ==9.2.7|| ==9.4.4 || ==9.6.1
28+
GHC ==8.6.5
29+
|| ==8.8.4
30+
|| ==8.10.4
31+
|| ==9.0.2
32+
|| ==9.2.8
33+
|| ==9.4.7
34+
|| ==9.6.3
35+
|| ==9.8.1
2836

2937
extra-source-files: ChangeLog.md
3038

@@ -61,8 +69,8 @@ library
6169

6270
other-modules: Data.GADT.Internal
6371
build-depends:
64-
base >=4.12 && <4.19
65-
, deepseq >=1.4.4.0 && <1.5
72+
base >=4.12 && <4.20
73+
, deepseq >=1.4.4.0 && <1.6
6674

6775
if impl(ghc >=9.0)
6876
-- these flags may abort compilation with GHC-8.10

0 commit comments

Comments
 (0)