Skip to content

Commit 778713b

Browse files
committed
v0.11.101.0-r6: Relax base, add GHC 9.12.1 to CI
1 parent f756ec3 commit 778713b

File tree

4 files changed

+40
-29
lines changed

4 files changed

+40
-29
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# This GitHub workflow config has been generated by a script via
22
#
3-
# haskell-ci 'github' 'cabal.project'
3+
# haskell-ci 'github' 'cryptohash-sha1.cabal'
44
#
55
# To regenerate the script (for example after adjusting tested-with) run
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.20240517
11+
# version: 0.19.20241223
1212
#
13-
# REGENDATA ("0.19.20240517",["github","cabal.project"])
13+
# REGENDATA ("0.19.20241223",["github","cryptohash-sha1.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,19 +32,24 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.12.1
36+
compilerKind: ghc
37+
compilerVersion: 9.12.1
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.10.1
3641
compilerKind: ghc
3742
compilerVersion: 9.10.1
3843
setup-method: ghcup
3944
allow-failure: false
40-
- compiler: ghc-9.8.2
45+
- compiler: ghc-9.8.4
4146
compilerKind: ghc
42-
compilerVersion: 9.8.2
47+
compilerVersion: 9.8.4
4348
setup-method: ghcup
4449
allow-failure: false
45-
- compiler: ghc-9.6.5
50+
- compiler: ghc-9.6.6
4651
compilerKind: ghc
47-
compilerVersion: 9.6.5
52+
compilerVersion: 9.6.6
4853
setup-method: ghcup
4954
allow-failure: false
5055
- compiler: ghc-9.4.8
@@ -94,15 +99,29 @@ jobs:
9499
allow-failure: false
95100
fail-fast: false
96101
steps:
97-
- name: apt
102+
- name: apt-get install
98103
run: |
99104
apt-get update
100105
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
106+
- name: Install GHCup
107+
run: |
101108
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"
109+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
103110
chmod a+x "$HOME/.ghcup/bin/ghcup"
111+
- name: Install cabal-install
112+
run: |
113+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
114+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
115+
- name: Install GHC (GHCup)
116+
if: matrix.setup-method == 'ghcup'
117+
run: |
104118
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
105-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
119+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
120+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
121+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
122+
echo "HC=$HC" >> "$GITHUB_ENV"
123+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
124+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
106125
env:
107126
HCKIND: ${{ matrix.compilerKind }}
108127
HCNAME: ${{ matrix.compiler }}
@@ -113,21 +132,12 @@ jobs:
113132
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
114133
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
115134
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
116-
HCDIR=/opt/$HCKIND/$HCVER
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.10.3.0 -vnormal+nowrap" >> "$GITHUB_ENV"
124135
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
125136
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
126137
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
127138
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
128139
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
129140
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
130-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
131141
env:
132142
HCKIND: ${{ matrix.compilerKind }}
133143
HCNAME: ${{ matrix.compiler }}
@@ -243,8 +253,8 @@ jobs:
243253
rm -f cabal.project.local
244254
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
245255
- name: save cache
246-
uses: actions/cache/save@v4
247256
if: always()
257+
uses: actions/cache/save@v4
248258
with:
249259
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
250260
path: ~/.cabal/store

.github/workflows/simple.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
os: [macos-latest, windows-latest]
17-
ghc: ['9.2','9.4','9.6','9.8','9.10']
17+
ghc: ['9.2','9.4','9.6','9.8','9.10','9.12']
1818
fail-fast: false
1919
timeout-minutes:
2020
60
@@ -42,6 +42,9 @@ jobs:
4242
restore-keys: ${{ runner.os }}-${{ steps.setup-haskell.outputs.ghc-version }}-
4343

4444
- name: Build
45+
run: cabal build all
46+
47+
- name: Build w/ tests
4548
run: cabal build all --enable-tests
4649

4750
- name: Test

cabal.project

Lines changed: 0 additions & 3 deletions
This file was deleted.

cryptohash-sha1.cabal

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: >=1.10
22
name: cryptohash-sha1
33
version: 0.11.101.0
4-
x-revision: 5
4+
x-revision: 6
55
description:
66
A practical incremental and one-pass, pure API to the
77
<https://en.wikipedia.org/wiki/SHA-1 SHA-1 hash algorithm>
@@ -29,9 +29,10 @@ category: Data, Cryptography
2929
build-type: Simple
3030

3131
tested-with:
32+
GHC == 9.12.1
3233
GHC == 9.10.1
33-
GHC == 9.8.2
34-
GHC == 9.6.5
34+
GHC == 9.8.4
35+
GHC == 9.6.6
3536
GHC == 9.4.8
3637
GHC == 9.2.8
3738
GHC == 9.0.2
@@ -51,7 +52,7 @@ source-repository head
5152

5253
library
5354
default-language: Haskell2010
54-
build-depends: base >= 4.5 && < 4.21
55+
build-depends: base >= 4.5 && < 5
5556
, bytestring >= 0.9.2 && < 0.13
5657

5758
hs-source-dirs: src

0 commit comments

Comments
 (0)