Skip to content

Commit d160ca4

Browse files
andreasabelandreasabel
committed
Revisions for GHC 9.12
1 parent 8d3b2d9 commit d160ca4

File tree

9 files changed

+56
-36
lines changed

9 files changed

+56
-36
lines changed

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

Lines changed: 28 additions & 18 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/andreasabel/haskell-ci
9+
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20240517
11+
# version: 0.19.20241223
1212
#
13-
# REGENDATA ("0.19.20240517",["github","cabal.project"])
13+
# REGENDATA ("0.19.20241223",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,6 +32,11 @@ 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
@@ -42,9 +47,9 @@ jobs:
4247
compilerVersion: 9.8.2
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
@@ -84,15 +89,29 @@ jobs:
8489
allow-failure: false
8590
fail-fast: false
8691
steps:
87-
- name: apt
92+
- name: apt-get install
8893
run: |
8994
apt-get update
9095
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
96+
- name: Install GHCup
97+
run: |
9198
mkdir -p "$HOME/.ghcup/bin"
92-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
99+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
93100
chmod a+x "$HOME/.ghcup/bin/ghcup"
101+
- name: Install cabal-install
102+
run: |
103+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
104+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
105+
- name: Install GHC (GHCup)
106+
if: matrix.setup-method == 'ghcup'
107+
run: |
94108
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
95-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
109+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
110+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
111+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
112+
echo "HC=$HC" >> "$GITHUB_ENV"
113+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
114+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
96115
env:
97116
HCKIND: ${{ matrix.compilerKind }}
98117
HCNAME: ${{ matrix.compiler }}
@@ -103,21 +122,12 @@ jobs:
103122
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
104123
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
105124
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
106-
HCDIR=/opt/$HCKIND/$HCVER
107-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
108-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
109-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
110-
echo "HC=$HC" >> "$GITHUB_ENV"
111-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
112-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
113-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.3.0 -vnormal+nowrap" >> "$GITHUB_ENV"
114125
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
115126
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
116127
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
117128
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
118129
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
119130
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
120-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
121131
env:
122132
HCKIND: ${{ matrix.compilerKind }}
123133
HCNAME: ${{ matrix.compiler }}
@@ -299,8 +309,8 @@ jobs:
299309
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='hackage-security -lukko' --dependencies-only -j2 all
300310
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='hackage-security -lukko' all
301311
- name: save cache
302-
uses: actions/cache/save@v4
303312
if: always()
313+
uses: actions/cache/save@v4
304314
with:
305315
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
306316
path: ~/.cabal/store

‎example-client/example-client.cabal‎

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

1414
tested-with:
15+
GHC == 9.12.1
1516
GHC == 9.10.1
1617
GHC == 9.8.2
17-
GHC == 9.6.5
18+
GHC == 9.6.6
1819
GHC == 9.4.8
1920
GHC == 9.2.8
2021
GHC == 9.0.2
@@ -32,7 +33,7 @@ executable example-client
3233
main-is: Main.hs
3334
other-modules: ExampleClient.Options
3435

35-
build-depends: base >= 4.11 && < 4.21,
36+
build-depends: base >= 4.11 && < 4.22,
3637
bytestring >= 0.10.8.2,
3738
directory >= 1.3.1.5,
3839
filepath >= 1.4.2,

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cabal-version: 1.12
22
name: hackage-repo-tool
33
version: 0.1.1.4
4+
x-revision: 1
45

56
build-type: Simple
67
synopsis: Manage secure file-based package repositories
@@ -23,9 +24,10 @@ homepage: https://github.com/haskell/hackage-security
2324
bug-reports: https://github.com/haskell/hackage-security/issues
2425

2526
tested-with:
27+
GHC == 9.12.1
2628
GHC == 9.10.1
2729
GHC == 9.8.2
28-
GHC == 9.6.5
30+
GHC == 9.6.6
2931
GHC == 9.4.8
3032
GHC == 9.2.8
3133
GHC == 9.0.2
@@ -57,7 +59,7 @@ executable hackage-repo-tool
5759

5860
-- For boot libraries we try to accomodate the versions bundled with
5961
-- the respective GHC release
60-
build-depends: base >= 4.11 && < 4.21,
62+
build-depends: base >= 4.11 && < 4.22,
6163
bytestring >= 0.10.8.2 && < 0.13,
6264
directory >= 1.3.1.5 && < 1.4,
6365
filepath >= 1.4.2 && < 1.6,

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

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

1818
tested-with:
19+
GHC == 9.12.1
1920
GHC == 9.10.1
2021
GHC == 9.8.2
21-
GHC == 9.6.5
22+
GHC == 9.6.6
2223
GHC == 9.4.8
2324
GHC == 9.2.8
2425
GHC == 9.0.2

‎hackage-security-HTTP/hackage-security-HTTP.cabal‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cabal-version: 1.12
22
name: hackage-security-HTTP
33
version: 0.1.1.2
4+
x-revision: 1
45

56
synopsis: Hackage security bindings against the HTTP library
67
description: The hackage security library provides a 'HttpLib'
@@ -18,9 +19,10 @@ bug-reports: https://github.com/haskell/hackage-security/issues
1819
build-type: Simple
1920

2021
tested-with:
22+
GHC == 9.12.1
2123
GHC == 9.10.1
2224
GHC == 9.8.2
23-
GHC == 9.6.5
25+
GHC == 9.6.6
2426
GHC == 9.4.8
2527
GHC == 9.2.8
2628
GHC == 9.0.2
@@ -38,7 +40,7 @@ source-repository head
3840

3941
library
4042
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HTTP
41-
build-depends: base >= 4.11 && < 4.21,
43+
build-depends: base >= 4.11 && < 4.22,
4244
bytestring >= 0.10.8.2 && < 0.13,
4345
HTTP >= 4000.2.19 && < 4000.5,
4446
mtl >= 2.2.2 && < 2.4,

‎hackage-security-curl/hackage-security-curl.cabal‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ build-type: Simple
1616
cabal-version: >=1.10
1717

1818
tested-with:
19+
GHC == 9.12.1
1920
GHC == 9.10.1
2021
GHC == 9.8.2
21-
GHC == 9.6.5
22+
GHC == 9.6.6
2223
GHC == 9.4.8
2324
GHC == 9.2.8
2425
GHC == 9.0.2
@@ -29,7 +30,7 @@ tested-with:
2930

3031
library
3132
exposed-modules: Hackage.Security.Client.Repository.HttpLib.Curl
32-
build-depends: base >= 4.11 && < 4.21,
33+
build-depends: base >= 4.11 && < 4.22,
3334
bytestring >= 0.10.8.2 && < 0.13,
3435
network-uri >= 2.6 && < 2.7,
3536
network >= 2.6 && < 3.3,

‎hackage-security-http-client/hackage-security-http-client.cabal‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ cabal-version: >=1.10
1616
extra-source-files: ChangeLog.md
1717

1818
tested-with:
19+
GHC == 9.12.1
1920
GHC == 9.10.1
2021
GHC == 9.8.2
21-
GHC == 9.6.5
22+
GHC == 9.6.6
2223
GHC == 9.4.8
2324
GHC == 9.2.8
2425
GHC == 9.0.2
@@ -29,7 +30,7 @@ tested-with:
2930

3031
library
3132
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HttpClient
32-
build-depends: base >= 4.11 && < 4.21,
33+
build-depends: base >= 4.11 && < 4.22,
3334
bytestring >= 0.10.8.2 && < 0.13,
3435
http-client >= 0.4 && < 0.8,
3536
http-types >= 0.12.2 && < 0.13,

‎hackage-security/hackage-security.cabal‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 1.12
22
name: hackage-security
33
version: 0.6.2.6
4-
x-revision: 4
4+
x-revision: 5
55

66
synopsis: Hackage security library
77
description: The hackage security library provides both server and
@@ -32,9 +32,10 @@ bug-reports: https://github.com/haskell/hackage-security/issues
3232
build-type: Simple
3333

3434
tested-with:
35+
GHC == 9.12.1
3536
GHC == 9.10.1
3637
GHC == 9.8.2
37-
GHC == 9.6.5
38+
GHC == 9.6.6
3839
GHC == 9.4.8
3940
GHC == 9.2.8
4041
GHC == 9.0.2
@@ -106,7 +107,7 @@ library
106107
Hackage.Security.Util.Stack
107108
Hackage.Security.Util.TypedEmbedded
108109

109-
build-depends: base >= 4.11 && < 4.21,
110+
build-depends: base >= 4.11 && < 4.22,
110111
base16-bytestring >= 0.1.1 && < 1.1,
111112
base64-bytestring >= 1.0 && < 1.3,
112113
bytestring >= 0.10.8.2 && < 0.13,
@@ -123,12 +124,12 @@ library
123124
-- 0.4.2 introduces TarIndex, 0.4.4 introduces more
124125
-- functionality, 0.5.0 changes type of serialise
125126
tar >= 0.5 && < 0.7,
126-
template-haskell >= 2.13 && < 2.23,
127+
template-haskell >= 2.13 && < 2.24,
127128
time >= 1.8.0.2 && < 1.15,
128129
transformers >= 0.3 && < 0.7,
129130
zlib >= 0.5 && < 0.8,
130131
-- whatever versions are bundled with ghc:
131-
ghc-prim >= 0.5.2 && < 0.12
132+
ghc-prim >= 0.5.2 && < 0.14
132133

133134
if flag(lukko)
134135
build-depends: lukko >= 0.1 && < 0.2

‎precompute-fileinfo/precompute-fileinfo.cabal‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ build-type: Simple
1515
cabal-version: >=1.10
1616

1717
tested-with:
18+
GHC == 9.12.1
1819
GHC == 9.10.1
1920
GHC == 9.8.2
20-
GHC == 9.6.5
21+
GHC == 9.6.6
2122
GHC == 9.4.8
2223
GHC == 9.2.8
2324
GHC == 9.0.2
@@ -28,7 +29,7 @@ tested-with:
2829

2930
executable precompute-fileinfo
3031
main-is: Main.hs
31-
build-depends: base >= 4.11 && < 4.21,
32+
build-depends: base >= 4.11 && < 4.22,
3233
bytestring >= 0.10.8.2 && < 0.13,
3334
containers >= 0.5.11 && < 0.8,
3435
deepseq >= 1.4.3 && < 1.6,

0 commit comments

Comments
 (0)