Skip to content

Commit 2a712db

Browse files
bgamaribgamari
authored
Merge pull request #209 from bgamari/wip/release
Release 0.8.9.2
2 parents 0fe6701 + a501955 commit 2a712db

3 files changed

Lines changed: 47 additions & 21 deletions

File tree

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

Lines changed: 35 additions & 17 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.15.20220812
11+
# version: 0.18.1
1212
#
13-
# REGENDATA ("0.15.20220812",["--no-benchmarks","--no-tests","github","binary.cabal"])
13+
# REGENDATA ("0.18.1",["--no-benchmarks","--no-tests","github","binary.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -28,6 +28,16 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31+
- compiler: ghc-9.8.1
32+
compilerKind: ghc
33+
compilerVersion: 9.8.1
34+
setup-method: ghcup
35+
allow-failure: false
36+
- compiler: ghc-9.6.3
37+
compilerKind: ghc
38+
compilerVersion: 9.6.3
39+
setup-method: ghcup
40+
allow-failure: false
3141
- compiler: ghc-9.4.4
3242
compilerKind: ghc
3343
compilerVersion: 9.4.4
@@ -81,18 +91,18 @@ jobs:
8191
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8292
if [ "${{ matrix.setup-method }}" = ghcup ]; then
8393
mkdir -p "$HOME/.ghcup/bin"
84-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
94+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
8595
chmod a+x "$HOME/.ghcup/bin/ghcup"
8696
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
87-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.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.18.0/x86_64-linux-ghcup-0.1.18.0 > "$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"
95-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
105+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
96106
fi
97107
env:
98108
HCKIND: ${{ matrix.compilerKind }}
@@ -106,17 +116,19 @@ jobs:
106116
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
107117
HCDIR=/opt/$HCKIND/$HCVER
108118
if [ "${{ matrix.setup-method }}" = ghcup ]; then
109-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
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#')
110122
echo "HC=$HC" >> "$GITHUB_ENV"
111-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
112-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
113-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
123+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
124+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
125+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
114126
else
115127
HC=$HCDIR/bin/$HCKIND
116128
echo "HC=$HC" >> "$GITHUB_ENV"
117129
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
118130
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
119-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
131+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
120132
fi
121133
122134
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -168,14 +180,14 @@ jobs:
168180
- name: install cabal-plan
169181
run: |
170182
mkdir -p $HOME/.cabal/bin
171-
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
172-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
183+
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
184+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
173185
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
174186
rm -f cabal-plan.xz
175187
chmod a+x $HOME/.cabal/bin/cabal-plan
176188
cabal-plan --version
177189
- name: checkout
178-
uses: actions/checkout@v2
190+
uses: actions/checkout@v3
179191
with:
180192
path: source
181193
- name: initial cabal.project for sdist
@@ -210,8 +222,8 @@ jobs:
210222
run: |
211223
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
212224
cabal-plan
213-
- name: cache
214-
uses: actions/cache@v2
225+
- name: restore cache
226+
uses: actions/cache/restore@v3
215227
with:
216228
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
217229
path: ~/.cabal/store
@@ -232,8 +244,14 @@ jobs:
232244
${CABAL} -vnormal check
233245
- name: haddock
234246
run: |
235-
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
247+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
236248
- name: unconstrained build
237249
run: |
238250
rm -f cabal.project.local
239251
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
252+
- name: save cache
253+
uses: actions/cache/save@v3
254+
if: always()
255+
with:
256+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
257+
path: ~/.cabal/store

‎binary.cabal‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cabal-version: 3.0
99
-- sed -i 's/\(binary\),/\1-cabal-is-broken,/' binary.cabal
1010

1111
name: binary
12-
version: 0.8.9.1
12+
version: 0.8.9.2
1313
license: BSD-3-Clause
1414
license-file: LICENSE
1515
author: Lennart Kolmodin <kolmodin@gmail.com>
@@ -27,13 +27,14 @@ synopsis: Binary serialisation for Haskell values using lazy ByteStrings
2727
category: Data, Parsing
2828
stability: provisional
2929
build-type: Simple
30-
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.6, GHC == 9.4.4
30+
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.6, GHC == 9.4.4, GHC == 9.6.3, GHC == 9.8.1
3131
extra-source-files:
32-
README.md changelog.md docs/hcar/binary-Lb.tex tools/derive/*.hs
33-
32+
tools/derive/*.hs
3433
-- from the benchmark 'bench'
3534
extra-source-files:
3635
benchmarks/CBenchmark.h
36+
extra-doc-files:
37+
README.md changelog.md docs/hcar/binary-Lb.tex
3738

3839
source-repository head
3940
type: git

‎changelog.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
binary
22
======
33

4+
binary-0.8.9.2
5+
--------------
6+
7+
- Documentation improvements
8+
- Ensure that `many` has an unfolding
9+
- Import `Data.List` as qualified
10+
411
binary-0.8.9.1
512
--------------
613

0 commit comments

Comments
 (0)