Skip to content

Commit 9429183

Browse files
simonmarsimonmar
authored
Merge pull request #159 from andreasabel/ci-ghc-9.10.1
Bump CI to GHC 9.10.1, allow hashable-1.5
2 parents 3af45d9 + 37c0745 commit 9429183

File tree

2 files changed

+26
-67
lines changed

2 files changed

+26
-67
lines changed

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

Lines changed: 21 additions & 62 deletions
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.18.1.20240316
11+
# version: 0.19.20240703
1212
#
13-
# REGENDATA ("0.18.1.20240316",["github","async.cabal"])
13+
# REGENDATA ("0.19.20240703",["github","async.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -27,24 +27,24 @@ jobs:
2727
timeout-minutes:
2828
60
2929
container:
30-
image: buildpack-deps:focal
30+
image: buildpack-deps:jammy
3131
continue-on-error: ${{ matrix.allow-failure }}
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.10.0.20240313
35+
- compiler: ghc-9.10.1
3636
compilerKind: ghc
37-
compilerVersion: 9.10.0.20240313
37+
compilerVersion: 9.10.1
3838
setup-method: ghcup
3939
allow-failure: false
4040
- compiler: ghc-9.8.2
4141
compilerKind: ghc
4242
compilerVersion: 9.8.2
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.6.4
45+
- compiler: ghc-9.6.6
4646
compilerKind: ghc
47-
compilerVersion: 9.6.4
47+
compilerVersion: 9.6.6
4848
setup-method: ghcup
4949
allow-failure: false
5050
- compiler: ghc-9.4.8
@@ -92,34 +92,17 @@ jobs:
9292
compilerVersion: 8.0.2
9393
setup-method: ghcup
9494
allow-failure: false
95-
- compiler: ghc-7.10.3
96-
compilerKind: ghc
97-
compilerVersion: 7.10.3
98-
setup-method: hvr-ppa
99-
allow-failure: false
10095
fail-fast: false
10196
steps:
10297
- name: apt
10398
run: |
10499
apt-get update
105100
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
106-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
107-
mkdir -p "$HOME/.ghcup/bin"
108-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
109-
chmod a+x "$HOME/.ghcup/bin/ghcup"
110-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
111-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
112-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
113-
else
114-
apt-add-repository -y 'ppa:hvr/ghc'
115-
apt-get update
116-
apt-get install -y "$HCNAME"
117-
mkdir -p "$HOME/.ghcup/bin"
118-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
119-
chmod a+x "$HOME/.ghcup/bin/ghcup"
120-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
121-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
122-
fi
101+
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"
103+
chmod a+x "$HOME/.ghcup/bin/ghcup"
104+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
105+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
123106
env:
124107
HCKIND: ${{ matrix.compilerKind }}
125108
HCNAME: ${{ matrix.compiler }}
@@ -131,27 +114,18 @@ jobs:
131114
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
132115
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
133116
HCDIR=/opt/$HCKIND/$HCVER
134-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
135-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
136-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
137-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
138-
echo "HC=$HC" >> "$GITHUB_ENV"
139-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
140-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
141-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.1 -vnormal+nowrap" >> "$GITHUB_ENV"
142-
else
143-
HC=$HCDIR/bin/$HCKIND
144-
echo "HC=$HC" >> "$GITHUB_ENV"
145-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
146-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
147-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.1 -vnormal+nowrap" >> "$GITHUB_ENV"
148-
fi
149-
117+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
118+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
119+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
120+
echo "HC=$HC" >> "$GITHUB_ENV"
121+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
122+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
123+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
150124
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
151125
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
152126
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
153127
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
154-
if [ $((HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
128+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
155129
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
156130
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
157131
env:
@@ -180,18 +154,6 @@ jobs:
180154
repository hackage.haskell.org
181155
url: http://hackage.haskell.org/
182156
EOF
183-
if $HEADHACKAGE; then
184-
cat >> $CABAL_CONFIG <<EOF
185-
repository head.hackage.ghc.haskell.org
186-
url: https://ghc.gitlab.haskell.org/head.hackage/
187-
secure: True
188-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
189-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
190-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
191-
key-threshold: 3
192-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
193-
EOF
194-
fi
195157
cat >> $CABAL_CONFIG <<EOF
196158
program-default-options
197159
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -243,10 +205,7 @@ jobs:
243205
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
244206
cat >> cabal.project <<EOF
245207
EOF
246-
if $HEADHACKAGE; then
247-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
248-
fi
249-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(async)$/; }' >> cabal.project.local
208+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(async)$/; }' >> cabal.project.local
250209
cat cabal.project
251210
cat cabal.project.local
252211
- name: dump install plan

‎async.cabal‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ cabal-version: >=1.10
3535
homepage: https://github.com/simonmar/async
3636
bug-reports: https://github.com/simonmar/async/issues
3737
tested-with:
38-
GHC == 9.10.0
38+
GHC == 9.10.1
3939
GHC == 9.8.2
40-
GHC == 9.6.4
40+
GHC == 9.6.6
4141
GHC == 9.4.8
4242
GHC == 9.2.8
4343
GHC == 9.0.2
@@ -47,8 +47,8 @@ tested-with:
4747
GHC == 8.4.4
4848
GHC == 8.2.2
4949
GHC == 8.0.2
50-
GHC == 7.10.3
51-
-- Drop GHC < 7.10 to be able to use the ubuntu-20.04 buildpack
50+
-- CI does not support GHC 7
51+
-- GHC == 7.10.3
5252
-- GHC == 7.8.4
5353
-- GHC == 7.6.3
5454
-- GHC == 7.4.2
@@ -71,7 +71,7 @@ library
7171
exposed-modules: Control.Concurrent.Async
7272
Control.Concurrent.Async.Internal
7373
build-depends: base >= 4.3 && < 4.21,
74-
hashable >= 1.1.2.0 && < 1.5,
74+
hashable >= 1.1.2.0 && < 1.6,
7575
stm >= 2.2 && < 2.6
7676

7777
test-suite test-async

0 commit comments

Comments
 (0)