Skip to content

Commit e11917b

Browse files
committed
Allow containers<1, bump CI to GHC 9.12.2
1 parent a71ddec commit e11917b

File tree

3 files changed

+18
-34
lines changed

3 files changed

+18
-34
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 13 additions & 29 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.20241219
11+
# version: 0.19.20250327
1212
#
13-
# REGENDATA ("0.19.20241219",["--config=cabal.haskell-ci","github","cabal.project"])
13+
# REGENDATA ("0.19.20250327",["--config=cabal.haskell-ci","github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
linux:
2525
name: Haskell-CI - Linux - ${{ matrix.compiler }}
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2727
timeout-minutes:
2828
60
2929
container:
@@ -32,9 +32,9 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.12.1
35+
- compiler: ghc-9.12.2
3636
compilerKind: ghc
37-
compilerVersion: 9.12.1
37+
compilerVersion: 9.12.2
3838
setup-method: ghcup
3939
allow-failure: false
4040
- compiler: ghc-9.10.1
@@ -47,9 +47,9 @@ jobs:
4747
compilerVersion: 9.8.4
4848
setup-method: ghcup
4949
allow-failure: false
50-
- compiler: ghc-9.6.6
50+
- compiler: ghc-9.6.7
5151
compilerKind: ghc
52-
compilerVersion: 9.6.6
52+
compilerVersion: 9.6.7
5353
setup-method: ghcup
5454
allow-failure: false
5555
- compiler: ghc-9.4.8
@@ -101,13 +101,12 @@ jobs:
101101
- name: Install GHCup
102102
run: |
103103
mkdir -p "$HOME/.ghcup/bin"
104-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
104+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
105105
chmod a+x "$HOME/.ghcup/bin/ghcup"
106-
- name: Install cabal-install (prerelease)
106+
- name: Install cabal-install
107107
run: |
108-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
109-
"$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false)
110-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV"
108+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
109+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
111110
- name: Install GHC (GHCup)
112111
if: matrix.setup-method == 'ghcup'
113112
run: |
@@ -132,7 +131,7 @@ jobs:
132131
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
133132
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
134133
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
135-
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
134+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
136135
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
137136
env:
138137
HCKIND: ${{ matrix.compilerKind }}
@@ -160,18 +159,6 @@ jobs:
160159
repository hackage.haskell.org
161160
url: http://hackage.haskell.org/
162161
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
175162
cat >> $CABAL_CONFIG <<EOF
176163
program-default-options
177164
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -233,9 +220,6 @@ jobs:
233220
constraints: operational -buildExamples
234221
optimization: False
235222
EOF
236-
if $HEADHACKAGE; then
237-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
238-
fi
239223
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(github|github-samples)$/; }' >> cabal.project.local
240224
cat cabal.project
241225
cat cabal.project.local

github.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ copyright:
3030
Copyright 2012-2013 Mike Burns, Copyright 2013-2015 John Wiegley, Copyright 2016-2021 Oleg Grenrus
3131

3232
tested-with:
33-
GHC == 9.12.1
33+
GHC == 9.12.2
3434
GHC == 9.10.1
3535
GHC == 9.8.4
36-
GHC == 9.6.6
36+
GHC == 9.6.7
3737
GHC == 9.4.8
3838
GHC == 9.2.8
3939
GHC == 9.0.2
@@ -186,7 +186,7 @@ library
186186
base >=4.10 && <5
187187
, binary >=0.7.1.0 && <0.11
188188
, bytestring >=0.10.4.0 && <0.13
189-
, containers >=0.5.5.1 && <0.8
189+
, containers >=0.5.5.1 && <1
190190
, deepseq >=1.3.0.2 && <1.6
191191
, exceptions >=0.10.2 && <0.11
192192
, mtl >=2.1.3.1 && <2.2 || >=2.2.1 && <2.4

samples/github-samples.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ description: Various samples of github package
1010
build-type: Simple
1111

1212
tested-with:
13-
GHC == 9.12.1
13+
GHC == 9.12.2
1414
GHC == 9.10.1
1515
GHC == 9.8.4
16-
GHC == 9.6.6
16+
GHC == 9.6.7
1717
GHC == 9.4.8
1818
GHC == 9.2.8
1919
GHC == 9.0.2

0 commit comments

Comments
 (0)