Skip to content

Commit 85ce2ad

Browse files
phadejphadej
committed
Relax bounds to allow GHC-9.10.1
1 parent cf02a9c commit 85ce2ad

File tree

4 files changed

+45
-32
lines changed

4 files changed

+45
-32
lines changed

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

Lines changed: 38 additions & 26 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
11+
# version: 0.19.20240513
1212
#
13-
# REGENDATA ("0.16",["github","--config=cabal.haskell-ci","--benchmarks-jobs=<9.0","cabal.project"])
13+
# REGENDATA ("0.19.20240513",["github","--config=cabal.haskell-ci","--benchmarks-jobs=<9.0","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,24 +23,34 @@ jobs:
2323
timeout-minutes:
2424
60
2525
container:
26-
image: buildpack-deps:bionic
26+
image: buildpack-deps:focal
2727
continue-on-error: ${{ matrix.allow-failure }}
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.6.1
31+
- compiler: ghc-9.10.1
3232
compilerKind: ghc
33-
compilerVersion: 9.6.1
33+
compilerVersion: 9.10.1
3434
setup-method: ghcup
3535
allow-failure: false
36-
- compiler: ghc-9.4.4
36+
- compiler: ghc-9.8.2
3737
compilerKind: ghc
38-
compilerVersion: 9.4.4
38+
compilerVersion: 9.8.2
3939
setup-method: ghcup
4040
allow-failure: false
41-
- compiler: ghc-9.2.7
41+
- compiler: ghc-9.6.5
4242
compilerKind: ghc
43-
compilerVersion: 9.2.7
43+
compilerVersion: 9.6.5
44+
setup-method: ghcup
45+
allow-failure: false
46+
- compiler: ghc-9.4.8
47+
compilerKind: ghc
48+
compilerVersion: 9.4.8
49+
setup-method: ghcup
50+
allow-failure: false
51+
- compiler: ghc-9.2.8
52+
compilerKind: ghc
53+
compilerVersion: 9.2.8
4454
setup-method: ghcup
4555
allow-failure: false
4656
- compiler: ghc-9.0.2
@@ -86,18 +96,18 @@ jobs:
8696
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8797
if [ "${{ matrix.setup-method }}" = ghcup ]; then
8898
mkdir -p "$HOME/.ghcup/bin"
89-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
99+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
90100
chmod a+x "$HOME/.ghcup/bin/ghcup"
91101
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
92-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
102+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
93103
else
94104
apt-add-repository -y 'ppa:hvr/ghc'
95105
apt-get update
96106
apt-get install -y "$HCNAME"
97107
mkdir -p "$HOME/.ghcup/bin"
98-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
108+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
99109
chmod a+x "$HOME/.ghcup/bin/ghcup"
100-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
110+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
101111
fi
102112
env:
103113
HCKIND: ${{ matrix.compilerKind }}
@@ -111,17 +121,19 @@ jobs:
111121
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
112122
HCDIR=/opt/$HCKIND/$HCVER
113123
if [ "${{ matrix.setup-method }}" = ghcup ]; then
114-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
124+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
125+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
126+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
115127
echo "HC=$HC" >> "$GITHUB_ENV"
116-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
117-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
118-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
128+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
129+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
130+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
119131
else
120132
HC=$HCDIR/bin/$HCKIND
121133
echo "HC=$HC" >> "$GITHUB_ENV"
122134
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
123135
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
124-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
136+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
125137
fi
126138
127139
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -171,9 +183,9 @@ jobs:
171183
run: |
172184
$CABAL v2-update -v
173185
- name: cache (tools)
174-
uses: actions/cache/restore@v3
186+
uses: actions/cache/restore@v4
175187
with:
176-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-43755058
188+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-53a0204c
177189
path: ~/.haskell-ci-tools
178190
- name: install cabal-plan
179191
run: |
@@ -186,16 +198,16 @@ jobs:
186198
cabal-plan --version
187199
- name: install doctest
188200
run: |
189-
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi
201+
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.22.0' ; fi
190202
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi
191203
- name: save cache (tools)
192-
uses: actions/cache/save@v3
204+
uses: actions/cache/save@v4
193205
if: always()
194206
with:
195-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-43755058
207+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-53a0204c
196208
path: ~/.haskell-ci-tools
197209
- name: checkout
198-
uses: actions/checkout@v3
210+
uses: actions/checkout@v4
199211
with:
200212
path: source
201213
- name: initial cabal.project for sdist
@@ -237,7 +249,7 @@ jobs:
237249
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
238250
cabal-plan
239251
- name: restore cache
240-
uses: actions/cache/restore@v3
252+
uses: actions/cache/restore@v4
241253
with:
242254
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
243255
path: ~/.cabal/store
@@ -275,7 +287,7 @@ jobs:
275287
rm -f cabal.project.local
276288
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
277289
- name: save cache
278-
uses: actions/cache/save@v3
290+
uses: actions/cache/save@v4
279291
if: always()
280292
with:
281293
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

‎cabal.haskell-ci‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
distribution: focal
12
doctest: <9.0
23
doctest-options: --preserve-it

‎generics-sop/generics-sop.cabal‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ category: Generics
4242
build-type: Simple
4343
cabal-version: >=1.10
4444
extra-source-files: CHANGELOG.md doctest.sh
45-
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.7, GHC == 9.4.4, GHC == 9.6.1, GHC == 9.8.1
45+
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.8, GHC == 9.4.8, GHC == 9.6.5, GHC == 9.8.2, GHC == 9.10.1
4646

4747
source-repository head
4848
type: git
@@ -65,10 +65,10 @@ library
6565
Generics.SOP.NP
6666
Generics.SOP.NS
6767
Generics.SOP.Sing
68-
build-depends: base >= 4.9 && < 4.20,
68+
build-depends: base >= 4.9 && < 4.21,
6969
sop-core == 0.5.0.*,
70-
template-haskell >= 2.8 && < 2.22,
71-
th-abstraction >= 0.6 && < 0.7,
70+
template-haskell >= 2.8 && < 2.23,
71+
th-abstraction >= 0.6 && < 0.8,
7272
ghc-prim >= 0.3 && < 0.12
7373
hs-source-dirs: src
7474
default-language: Haskell2010

‎sop-core/sop-core.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ category: Data
2525
build-type: Simple
2626
cabal-version: >=1.10
2727
extra-source-files: CHANGELOG.md doctest.sh
28-
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.7, GHC == 9.4.4, GHC == 9.6.1, GHC == 9.8.1
28+
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.8, GHC == 9.4.8, GHC == 9.6.5, GHC == 9.8.2, GHC == 9.10.1
2929

3030
source-repository head
3131
type: git
@@ -41,7 +41,7 @@ library
4141
Data.SOP.NP
4242
Data.SOP.NS
4343
Data.SOP.Sing
44-
build-depends: base >= 4.9 && < 4.20,
44+
build-depends: base >= 4.9 && < 4.21,
4545
deepseq >= 1.3 && < 1.6
4646
hs-source-dirs: src
4747
default-language: Haskell2010

0 commit comments

Comments
 (0)