Skip to content

Commit 7ea4164

Browse files
andreasabelandreasabel
committed
v0.2.0.0-r10: allow deepseq-1.5 for GHC 9.8
1 parent 2ba00e6 commit 7ea4164

File tree

3 files changed

+40
-127
lines changed

3 files changed

+40
-127
lines changed

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

Lines changed: 28 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,28 @@
66
#
77
# haskell-ci regenerate
88
#
9-
# For more information, see https://github.com/haskell-CI/haskell-ci
9+
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.16
11+
# version: 0.17.20231012
1212
#
13-
# REGENDATA ("0.16",["github","deepseq-generics.cabal"])
13+
# REGENDATA ("0.17.20231012",["github","deepseq-generics.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
1717
push:
1818
branches:
1919
- master
20-
- ci*
2120
pull_request:
2221
branches:
2322
- master
24-
- ci*
2523
jobs:
2624
linux:
2725
name: Haskell-CI - Linux - ${{ matrix.compiler }}
2826
runs-on: ubuntu-20.04
2927
timeout-minutes:
3028
60
3129
container:
32-
image: buildpack-deps:bionic
30+
image: buildpack-deps:focal
3331
continue-on-error: ${{ matrix.allow-failure }}
3432
strategy:
3533
matrix:
@@ -39,71 +37,21 @@ jobs:
3937
compilerVersion: 9.6.1
4038
setup-method: ghcup
4139
allow-failure: false
42-
- compiler: ghc-9.4.4
40+
- compiler: ghc-9.4.7
4341
compilerKind: ghc
44-
compilerVersion: 9.4.4
42+
compilerVersion: 9.4.7
4543
setup-method: ghcup
4644
allow-failure: false
47-
- compiler: ghc-9.4.3
45+
- compiler: ghc-9.2.8
4846
compilerKind: ghc
49-
compilerVersion: 9.4.3
50-
setup-method: ghcup
51-
allow-failure: false
52-
- compiler: ghc-9.4.2
53-
compilerKind: ghc
54-
compilerVersion: 9.4.2
55-
setup-method: ghcup
56-
allow-failure: false
57-
- compiler: ghc-9.4.1
58-
compilerKind: ghc
59-
compilerVersion: 9.4.1
60-
setup-method: ghcup
61-
allow-failure: false
62-
- compiler: ghc-9.2.7
63-
compilerKind: ghc
64-
compilerVersion: 9.2.7
65-
setup-method: ghcup
66-
allow-failure: false
67-
- compiler: ghc-9.2.6
68-
compilerKind: ghc
69-
compilerVersion: 9.2.6
70-
setup-method: ghcup
71-
allow-failure: false
72-
- compiler: ghc-9.2.5
73-
compilerKind: ghc
74-
compilerVersion: 9.2.5
75-
setup-method: ghcup
76-
allow-failure: false
77-
- compiler: ghc-9.2.4
78-
compilerKind: ghc
79-
compilerVersion: 9.2.4
80-
setup-method: ghcup
81-
allow-failure: false
82-
- compiler: ghc-9.2.3
83-
compilerKind: ghc
84-
compilerVersion: 9.2.3
85-
setup-method: ghcup
86-
allow-failure: false
87-
- compiler: ghc-9.2.2
88-
compilerKind: ghc
89-
compilerVersion: 9.2.2
90-
setup-method: ghcup
91-
allow-failure: false
92-
- compiler: ghc-9.2.1
93-
compilerKind: ghc
94-
compilerVersion: 9.2.1
47+
compilerVersion: 9.2.8
9548
setup-method: ghcup
9649
allow-failure: false
9750
- compiler: ghc-9.0.2
9851
compilerKind: ghc
9952
compilerVersion: 9.0.2
10053
setup-method: ghcup
10154
allow-failure: false
102-
- compiler: ghc-9.0.1
103-
compilerKind: ghc
104-
compilerVersion: 9.0.1
105-
setup-method: hvr-ppa
106-
allow-failure: false
10755
- compiler: ghc-8.10.7
10856
compilerKind: ghc
10957
compilerVersion: 8.10.7
@@ -112,69 +60,40 @@ jobs:
11260
- compiler: ghc-8.8.4
11361
compilerKind: ghc
11462
compilerVersion: 8.8.4
115-
setup-method: hvr-ppa
63+
setup-method: ghcup
11664
allow-failure: false
11765
- compiler: ghc-8.6.5
11866
compilerKind: ghc
11967
compilerVersion: 8.6.5
120-
setup-method: hvr-ppa
68+
setup-method: ghcup
12169
allow-failure: false
12270
- compiler: ghc-8.4.4
12371
compilerKind: ghc
12472
compilerVersion: 8.4.4
125-
setup-method: hvr-ppa
73+
setup-method: ghcup
12674
allow-failure: false
12775
- compiler: ghc-8.2.2
12876
compilerKind: ghc
12977
compilerVersion: 8.2.2
130-
setup-method: hvr-ppa
78+
setup-method: ghcup
13179
allow-failure: false
13280
- compiler: ghc-8.0.2
13381
compilerKind: ghc
13482
compilerVersion: 8.0.2
135-
setup-method: hvr-ppa
136-
allow-failure: false
137-
- compiler: ghc-7.10.3
138-
compilerKind: ghc
139-
compilerVersion: 7.10.3
140-
setup-method: hvr-ppa
141-
allow-failure: false
142-
- compiler: ghc-7.8.4
143-
compilerKind: ghc
144-
compilerVersion: 7.8.4
145-
setup-method: hvr-ppa
146-
allow-failure: false
147-
- compiler: ghc-7.6.3
148-
compilerKind: ghc
149-
compilerVersion: 7.6.3
150-
setup-method: hvr-ppa
151-
allow-failure: false
152-
- compiler: ghc-7.4.2
153-
compilerKind: ghc
154-
compilerVersion: 7.4.2
155-
setup-method: hvr-ppa
83+
setup-method: ghcup
15684
allow-failure: false
15785
fail-fast: false
15886
steps:
15987
- name: apt
16088
run: |
16189
apt-get update
162-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
163-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
164-
mkdir -p "$HOME/.ghcup/bin"
165-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
166-
chmod a+x "$HOME/.ghcup/bin/ghcup"
167-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
168-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
169-
else
170-
apt-add-repository -y 'ppa:hvr/ghc'
171-
apt-get update
172-
apt-get install -y "$HCNAME"
173-
mkdir -p "$HOME/.ghcup/bin"
174-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
175-
chmod a+x "$HOME/.ghcup/bin/ghcup"
176-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
177-
fi
90+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
91+
mkdir -p "$HOME/.ghcup/bin"
92+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
93+
chmod a+x "$HOME/.ghcup/bin/ghcup"
94+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
95+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
96+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
17897
env:
17998
HCKIND: ${{ matrix.compilerKind }}
18099
HCNAME: ${{ matrix.compiler }}
@@ -186,20 +105,13 @@ jobs:
186105
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
187106
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
188107
HCDIR=/opt/$HCKIND/$HCVER
189-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
190-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
191-
echo "HC=$HC" >> "$GITHUB_ENV"
192-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
193-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
194-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
195-
else
196-
HC=$HCDIR/bin/$HCKIND
197-
echo "HC=$HC" >> "$GITHUB_ENV"
198-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
199-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
200-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
201-
fi
202-
108+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
109+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
110+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
111+
echo "HC=$HC" >> "$GITHUB_ENV"
112+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
113+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
114+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
203115
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
204116
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
205117
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -256,7 +168,7 @@ jobs:
256168
chmod a+x $HOME/.cabal/bin/cabal-plan
257169
cabal-plan --version
258170
- name: checkout
259-
uses: actions/checkout@v3
171+
uses: actions/checkout@v4
260172
with:
261173
path: source
262174
- name: initial cabal.project for sdist

‎cabal.haskell-ci‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
branches: master ci*
1+
branches: master

‎deepseq-generics.cabal‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: deepseq-generics
22
version: 0.2.0.0
3-
x-revision: 9
3+
x-revision: 10
44

55
synopsis: GHC.Generics-based Control.DeepSeq.rnf implementation
66
homepage: https://github.com/haskell-hvr/deepseq-generics
@@ -15,20 +15,21 @@ build-type: Simple
1515
cabal-version: >=1.10
1616

1717
tested-with:
18-
GHC == 9.6.1
19-
GHC == 9.4.*
20-
GHC == 9.2.*
21-
GHC == 9.0.*
18+
GHC == 9.8.1
19+
GHC == 9.6.3
20+
GHC == 9.4.7
21+
GHC == 9.2.8
22+
GHC == 9.0.2
2223
GHC == 8.10.7
2324
GHC == 8.8.4
2425
GHC == 8.6.5
2526
GHC == 8.4.4
2627
GHC == 8.2.2
2728
GHC == 8.0.2
28-
GHC == 7.10.3
29-
GHC == 7.8.4
30-
GHC == 7.6.3
31-
GHC == 7.4.2
29+
-- GHC == 7.10.3
30+
-- GHC == 7.8.4
31+
-- GHC == 7.6.3
32+
-- GHC == 7.4.2
3233

3334
description:
3435
This package provides a "GHC.Generics"-based
@@ -62,7 +63,7 @@ library
6263
exposed-modules: Control.DeepSeq.Generics
6364
build-depends: base >= 4.5 && < 5
6465
, ghc-prim >= 0.2 && < 1
65-
, deepseq >= 1.2.0.1 && < 1.5
66+
, deepseq >= 1.2.0.1 && < 1.6
6667
other-extensions: BangPatterns, FlexibleContexts, TypeOperators
6768
ghc-options: -Wall
6869

0 commit comments

Comments
 (0)