Skip to content

Commit 2d6e7a3

Browse files
committed
Bump Haskell-CI to GHC 9.12.0, bump base
1 parent d8635e4 commit 2d6e7a3

File tree

2 files changed

+29
-7
lines changed

2 files changed

+29
-7
lines changed

.github/workflows/haskell-ci.yml

+25-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.19.20240703
11+
# version: 0.19.20241021
1212
#
13-
# REGENDATA ("0.19.20240703",["github","hsc2hs.cabal"])
13+
# REGENDATA ("0.19.20241021",["github","hsc2hs.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,6 +32,11 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.12.20241014
36+
compilerKind: ghc
37+
compilerVersion: 9.12.20241014
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.10.1
3641
compilerKind: ghc
3742
compilerVersion: 9.10.1
@@ -99,8 +104,9 @@ jobs:
99104
apt-get update
100105
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
101106
mkdir -p "$HOME/.ghcup/bin"
102-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
107+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
103108
chmod a+x "$HOME/.ghcup/bin/ghcup"
109+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
104110
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
105111
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
106112
env:
@@ -125,7 +131,7 @@ jobs:
125131
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
126132
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
127133
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
128-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
134+
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
129135
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
130136
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
131137
env:
@@ -154,6 +160,18 @@ jobs:
154160
repository hackage.haskell.org
155161
url: http://hackage.haskell.org/
156162
EOF
163+
if $HEADHACKAGE; then
164+
cat >> $CABAL_CONFIG <<EOF
165+
repository head.hackage.ghc.haskell.org
166+
url: https://ghc.gitlab.haskell.org/head.hackage/
167+
secure: True
168+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
169+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
170+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
171+
key-threshold: 3
172+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
173+
EOF
174+
fi
157175
cat >> $CABAL_CONFIG <<EOF
158176
program-default-options
159177
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -205,6 +223,9 @@ jobs:
205223
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
206224
cat >> cabal.project <<EOF
207225
EOF
226+
if $HEADHACKAGE; then
227+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
228+
fi
208229
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(hsc2hs)$/; }' >> cabal.project.local
209230
cat cabal.project
210231
cat cabal.project.local

hsc2hs.cabal

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: >=1.10
22
Name: hsc2hs
33
Version: 0.68.10
4-
x-revision: 2
4+
x-revision: 3
55

66
Copyright: 2000, Marcin Kowalczyk
77
License: BSD3
@@ -28,6 +28,7 @@ Data-Files: template-hsc.h
2828
build-type: Simple
2929

3030
tested-with:
31+
GHC == 9.12.0
3132
GHC == 9.10.1
3233
GHC == 9.8.2
3334
GHC == 9.6.6
@@ -76,7 +77,7 @@ Executable hsc2hs
7677

7778
Other-Extensions: CPP, NoMonomorphismRestriction
7879

79-
Build-Depends: base >= 4.3.0 && < 4.21,
80+
Build-Depends: base >= 4.3.0 && < 4.22,
8081
containers >= 0.4.0 && < 0.8,
8182
directory >= 1.1.0 && < 1.4,
8283
filepath >= 1.2.0 && < 1.6,
@@ -97,7 +98,7 @@ test-suite spec
9798
other-modules: ATTParser Flags BDD
9899
ghc-options: -Wall -threaded
99100
type: exitcode-stdio-1.0
100-
build-depends: base >= 4.3.0 && < 4.21,
101+
build-depends: base >= 4.3.0 && < 4.22,
101102
test-framework >= 0.8.2.0 && < 0.9,
102103
test-framework-hunit >= 0.3.0.2 && < 0.4,
103104
HUnit >= 1.3.1.2 && < 1.4 || >= 1.6.0.0 && < 1.7

0 commit comments

Comments
 (0)