Skip to content

Commit 54a2775

Browse files
phadejphadej
committed
Support GHC-9.12
1 parent d2bfeee commit 54a2775

File tree

3 files changed

+41
-23
lines changed

3 files changed

+41
-23
lines changed

Diff for: ‎.github/workflows/haskell-ci.yml

+31-19
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.19.20240514
11+
# version: 0.19.20241223
1212
#
13-
# REGENDATA ("0.19.20240514",["github","cabal.project"])
13+
# REGENDATA ("0.19.20241223",["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.12.1
36+
compilerKind: ghc
37+
compilerVersion: 9.12.1
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.10.1
3641
compilerKind: ghc
3742
compilerVersion: 9.10.1
3843
setup-method: ghcup
3944
allow-failure: false
40-
- compiler: ghc-9.8.2
45+
- compiler: ghc-9.8.4
4146
compilerKind: ghc
42-
compilerVersion: 9.8.2
47+
compilerVersion: 9.8.4
4348
setup-method: ghcup
4449
allow-failure: false
45-
- compiler: ghc-9.6.5
50+
- compiler: ghc-9.6.6
4651
compilerKind: ghc
47-
compilerVersion: 9.6.5
52+
compilerVersion: 9.6.6
4853
setup-method: ghcup
4954
allow-failure: false
5055
- compiler: ghc-9.4.8
@@ -79,15 +84,29 @@ jobs:
7984
allow-failure: false
8085
fail-fast: false
8186
steps:
82-
- name: apt
87+
- name: apt-get install
8388
run: |
8489
apt-get update
8590
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
91+
- name: Install GHCup
92+
run: |
8693
mkdir -p "$HOME/.ghcup/bin"
87-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
94+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
8895
chmod a+x "$HOME/.ghcup/bin/ghcup"
96+
- name: Install cabal-install
97+
run: |
98+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
99+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
100+
- name: Install GHC (GHCup)
101+
if: matrix.setup-method == 'ghcup'
102+
run: |
89103
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
90-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
104+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
105+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
106+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
107+
echo "HC=$HC" >> "$GITHUB_ENV"
108+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
109+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
91110
env:
92111
HCKIND: ${{ matrix.compilerKind }}
93112
HCNAME: ${{ matrix.compiler }}
@@ -98,21 +117,12 @@ jobs:
98117
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
99118
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
100119
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
101-
HCDIR=/opt/$HCKIND/$HCVER
102-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
103-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
104-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
105-
echo "HC=$HC" >> "$GITHUB_ENV"
106-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
107-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
108-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
109120
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
110121
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
111122
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
112123
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
113124
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
114125
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
115-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
116126
env:
117127
HCKIND: ${{ matrix.compilerKind }}
118128
HCNAME: ${{ matrix.compiler }}
@@ -189,6 +199,8 @@ jobs:
189199
echo "package binary-orphans" >> cabal.project
190200
echo " ghc-options: -Werror=missing-methods" >> cabal.project
191201
cat >> cabal.project <<EOF
202+
allow-newer: quickcheck-instances:base
203+
allow-newer: these:base
192204
EOF
193205
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(binary-orphans)$/; }' >> cabal.project.local
194206
cat cabal.project
@@ -228,8 +240,8 @@ jobs:
228240
rm -f cabal.project.local
229241
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
230242
- name: save cache
231-
uses: actions/cache/save@v4
232243
if: always()
244+
uses: actions/cache/save@v4
233245
with:
234246
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
235247
path: ~/.cabal/store

Diff for: ‎binary-orphans.cabal

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cabal-version: 1.12
22
name: binary-orphans
33
version: 1.0.5
4+
x-revision: 1
45
synopsis: Compatibility package for binary; provides instances
56
category: Data, Binary, Parsing, Compatibility
67
description:
@@ -21,9 +22,10 @@ tested-with:
2122
|| ==9.0.2
2223
|| ==9.2.8
2324
|| ==9.4.8
24-
|| ==9.6.5
25-
|| ==9.8.2
25+
|| ==9.6.6
26+
|| ==9.8.4
2627
|| ==9.10.1
28+
|| ==9.12.1
2729

2830
extra-source-files: CHANGELOG.md
2931

@@ -38,7 +40,7 @@ library
3840
exposed-modules: Data.Binary.Orphans
3941
other-extensions: CPP
4042
build-depends:
41-
base >=4.12.0.0 && <4.21
43+
base >=4.12.0.0 && <4.22
4244
, binary >=0.8.6.0 && <0.8.10
4345

4446
if !impl(ghc >=9.2)
@@ -62,7 +64,7 @@ test-suite binary-orphans-test
6264
, quickcheck-instances >=0.3.28 && <0.4
6365
, tagged >=0.8.6 && <0.9
6466
, tasty >=0.10.1.2 && <1.6
65-
, tasty-quickcheck >=0.8.3.2 && <0.11
67+
, tasty-quickcheck >=0.8.3.2 && <0.12
6668

6769
if impl(ghc >=8.0 && <9.4)
6870
build-depends: data-array-byte

Diff for: ‎cabal.project

+4
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
packages: .
2+
tests: True
3+
4+
allow-newer: quickcheck-instances:base
5+
allow-newer: these:base

0 commit comments

Comments
 (0)