Skip to content

Commit 3c13e0b

Browse files
andreasabelandreasabel
authored
containers-test: allow deepseq-1.5; bump CI to latest GHC minor versions (#986)
1 parent a4e8d16 commit 3c13e0b

File tree

3 files changed

+33
-21
lines changed

3 files changed

+33
-21
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.16.3
11+
# version: 0.17.20240109
1212
#
13-
# REGENDATA ("0.16.3",["github","--config=cabal.haskell-ci","--ghc-head","cabal.project"])
13+
# REGENDATA ("0.17.20240109",["github","--config=cabal.haskell-ci","--ghc-head","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,14 +32,24 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.6.2
35+
- compiler: ghc-9.8.1
3636
compilerKind: ghc
37-
compilerVersion: 9.6.2
37+
compilerVersion: 9.8.1
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.4.5
40+
- compiler: ghc-9.6.4
4141
compilerKind: ghc
42-
compilerVersion: 9.4.5
42+
compilerVersion: 9.6.4
43+
setup-method: ghcup
44+
allow-failure: false
45+
- compiler: ghc-9.4.8
46+
compilerKind: ghc
47+
compilerVersion: 9.4.8
48+
setup-method: ghcup
49+
allow-failure: false
50+
- compiler: ghc-9.2.8
51+
compilerKind: ghc
52+
compilerVersion: 9.2.8
4353
setup-method: ghcup
4454
allow-failure: false
4555
- compiler: ghc-9.0.2
@@ -80,20 +90,20 @@ jobs:
8090
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8191
if [ "${{ matrix.setup-method }}" = ghcup ]; then
8292
mkdir -p "$HOME/.ghcup/bin"
83-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
93+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
8494
chmod a+x "$HOME/.ghcup/bin/ghcup"
8595
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
8696
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
87-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
97+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8898
else
8999
apt-add-repository -y 'ppa:hvr/ghc'
90100
apt-get update
91101
apt-get install -y "$HCNAME"
92102
mkdir -p "$HOME/.ghcup/bin"
93-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
103+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
94104
chmod a+x "$HOME/.ghcup/bin/ghcup"
95105
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
96-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
106+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
97107
fi
98108
env:
99109
HCKIND: ${{ matrix.compilerKind }}
@@ -107,24 +117,26 @@ jobs:
107117
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
108118
HCDIR=/opt/$HCKIND/$HCVER
109119
if [ "${{ matrix.setup-method }}" = ghcup ]; then
110-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
120+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
121+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
122+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
111123
echo "HC=$HC" >> "$GITHUB_ENV"
112-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
113-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
114-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
124+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
125+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
126+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
115127
else
116128
HC=$HCDIR/bin/$HCKIND
117129
echo "HC=$HC" >> "$GITHUB_ENV"
118130
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
119131
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
120-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
132+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
121133
fi
122134
123135
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
124136
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
125137
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
126138
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
127-
if [ $((HCNUMVER > 90602)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
139+
if [ $((HCNUMVER > 90801)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
128140
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
129141
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
130142
env:

‎containers-tests/containers-tests.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ extra-source-files:
2727

2828
tested-with:
2929
GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 ||
30-
==9.4.5 || ==9.6.2 || ==9.8.1
30+
==9.4.8 || ==9.6.4 || ==9.8.1
3131

3232
source-repository head
3333
type: git
@@ -37,7 +37,7 @@ common deps
3737
build-depends:
3838
array >=0.4.0.0
3939
, base >=4.10 && <5
40-
, deepseq >=1.2 && <1.5
40+
, deepseq >=1.2 && <1.6
4141
, template-haskell
4242

4343
common test-deps
@@ -54,7 +54,7 @@ common benchmark-deps
5454
import: deps
5555
build-depends:
5656
containers-tests
57-
, deepseq >=1.1.0.0 && <1.5
57+
, deepseq >=1.1.0.0 && <1.6
5858
, tasty-bench >=0.3.1 && <0.4
5959

6060
-- Copy of containers library,
@@ -63,7 +63,7 @@ library
6363
default-language: Haskell2010
6464
-- this is important for testing; may it affect benchmarks?
6565
cpp-options: -DTESTING
66-
if impl(ghc >= 8.6.0)
66+
if impl(ghc >= 8.6)
6767
build-depends:
6868
nothunks
6969
, QuickCheck

‎containers/containers.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extra-source-files:
2828

2929
tested-with:
3030
GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 ||
31-
==9.4.5 || ==9.6.2 || ==9.8.1
31+
==9.4.8 || ==9.6.4 || ==9.8.1
3232

3333
source-repository head
3434
type: git

0 commit comments

Comments
 (0)