Skip to content

Commit 5864e5a

Browse files
committed
GHC 9.12
1 parent 7cd117e commit 5864e5a

File tree

2 files changed

+11
-41
lines changed

2 files changed

+11
-41
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 9 additions & 39 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.20241119
11+
# version: 0.19.20250104
1212
#
13-
# REGENDATA ("0.19.20241119",["github","visualize-cbn.cabal"])
13+
# REGENDATA ("0.19.20250104",["github","visualize-cbn.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -28,10 +28,10 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.12.0.20241114
31+
- compiler: ghc-9.12.1
3232
compilerKind: ghc
33-
compilerVersion: 9.12.0.20241114
34-
setup-method: ghcup-prerelease
33+
compilerVersion: 9.12.1
34+
setup-method: ghcup
3535
allow-failure: false
3636
- compiler: ghc-9.10.1
3737
compilerKind: ghc
@@ -81,8 +81,8 @@ jobs:
8181
chmod a+x "$HOME/.ghcup/bin/ghcup"
8282
- name: Install cabal-install
8383
run: |
84-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
85-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
84+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
85+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1 -vnormal+nowrap" >> "$GITHUB_ENV"
8686
- name: Install GHC (GHCup)
8787
if: matrix.setup-method == 'ghcup'
8888
run: |
@@ -97,21 +97,6 @@ jobs:
9797
HCKIND: ${{ matrix.compilerKind }}
9898
HCNAME: ${{ matrix.compiler }}
9999
HCVER: ${{ matrix.compilerVersion }}
100-
- name: Install GHC (GHCup prerelease)
101-
if: matrix.setup-method == 'ghcup-prerelease'
102-
run: |
103-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
104-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
105-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
106-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
107-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
108-
echo "HC=$HC" >> "$GITHUB_ENV"
109-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
110-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
111-
env:
112-
HCKIND: ${{ matrix.compilerKind }}
113-
HCNAME: ${{ matrix.compiler }}
114-
HCVER: ${{ matrix.compilerVersion }}
115100
- name: Set PATH and environment variables
116101
run: |
117102
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -122,7 +107,7 @@ jobs:
122107
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
123108
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
124109
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
125-
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
110+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
126111
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
127112
env:
128113
HCKIND: ${{ matrix.compilerKind }}
@@ -150,18 +135,6 @@ jobs:
150135
repository hackage.haskell.org
151136
url: http://hackage.haskell.org/
152137
EOF
153-
if $HEADHACKAGE; then
154-
cat >> $CABAL_CONFIG <<EOF
155-
repository head.hackage.ghc.haskell.org
156-
url: https://ghc.gitlab.haskell.org/head.hackage/
157-
secure: True
158-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
159-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
160-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
161-
key-threshold: 3
162-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
163-
EOF
164-
fi
165138
cat >> $CABAL_CONFIG <<EOF
166139
program-default-options
167140
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -213,9 +186,6 @@ jobs:
213186
echo " ghc-options: -Werror=missing-methods" >> cabal.project
214187
cat >> cabal.project <<EOF
215188
EOF
216-
if $HEADHACKAGE; then
217-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
218-
fi
219189
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(visualize-cbn)$/; }' >> cabal.project.local
220190
cat cabal.project
221191
cat cabal.project.local

visualize-cbn.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build-type: Simple
1414
extra-source-files: ChangeLog.md README.md CONTRIBUTORS
1515

1616
tested-with:
17-
GHC == 9.12.0
17+
GHC == 9.12.1
1818
GHC == 9.10.1
1919
GHC == 9.8.2
2020
GHC == 9.6.6
@@ -63,7 +63,7 @@ executable visualize-cbn
6363
, mtl >= 2.2 && < 2.4
6464
, optparse-applicative >= 0.18 && < 0.19
6565
, parsec >= 3.1 && < 3.2
66-
, template-haskell >= 2.16 && < 2.23
66+
, template-haskell >= 2.16 && < 2.24
6767
, text >= 1.2 && < 2.2
6868
hs-source-dirs: src
6969
default-language: Haskell2010

0 commit comments

Comments
 (0)