Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e2b01df

Browse files
clintyclinty
committedAug 12, 2024·
Test with GHC version 9.2.8 instead of 9.2.2.
1 parent 4609013 commit e2b01df

File tree

2 files changed

+45
-49
lines changed

2 files changed

+45
-49
lines changed
 

‎.github/workflows/haskell-ci.yml

+37-48
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.14.3
11+
# version: 0.19.20240708
1212
#
13-
# REGENDATA ("0.14.3",["github","ixset-typed.cabal"])
13+
# REGENDATA ("0.19.20240708",["github","ixset-typed.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -19,18 +19,18 @@ on:
1919
jobs:
2020
linux:
2121
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22-
runs-on: ubuntu-18.04
22+
runs-on: ubuntu-20.04
2323
timeout-minutes:
2424
60
2525
container:
26-
image: buildpack-deps:bionic
26+
image: buildpack-deps:jammy
2727
continue-on-error: ${{ matrix.allow-failure }}
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.2.2
31+
- compiler: ghc-9.2.8
3232
compilerKind: ghc
33-
compilerVersion: 9.2.2
33+
compilerVersion: 9.2.8
3434
setup-method: ghcup
3535
allow-failure: false
3636
- compiler: ghc-9.0.2
@@ -46,49 +46,39 @@ jobs:
4646
- compiler: ghc-8.8.4
4747
compilerKind: ghc
4848
compilerVersion: 8.8.4
49-
setup-method: hvr-ppa
49+
setup-method: ghcup
5050
allow-failure: false
5151
- compiler: ghc-8.6.5
5252
compilerKind: ghc
5353
compilerVersion: 8.6.5
54-
setup-method: hvr-ppa
54+
setup-method: ghcup
5555
allow-failure: false
5656
- compiler: ghc-8.4.4
5757
compilerKind: ghc
5858
compilerVersion: 8.4.4
59-
setup-method: hvr-ppa
59+
setup-method: ghcup
6060
allow-failure: false
6161
- compiler: ghc-8.2.2
6262
compilerKind: ghc
6363
compilerVersion: 8.2.2
64-
setup-method: hvr-ppa
64+
setup-method: ghcup
6565
allow-failure: false
6666
- compiler: ghc-8.0.2
6767
compilerKind: ghc
6868
compilerVersion: 8.0.2
69-
setup-method: hvr-ppa
69+
setup-method: ghcup
7070
allow-failure: false
7171
fail-fast: false
7272
steps:
7373
- name: apt
7474
run: |
7575
apt-get update
76-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
77-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
78-
mkdir -p "$HOME/.ghcup/bin"
79-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
80-
chmod a+x "$HOME/.ghcup/bin/ghcup"
81-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
82-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
83-
else
84-
apt-add-repository -y 'ppa:hvr/ghc'
85-
apt-get update
86-
apt-get install -y "$HCNAME"
87-
mkdir -p "$HOME/.ghcup/bin"
88-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
89-
chmod a+x "$HOME/.ghcup/bin/ghcup"
90-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
91-
fi
76+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
77+
mkdir -p "$HOME/.ghcup/bin"
78+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
79+
chmod a+x "$HOME/.ghcup/bin/ghcup"
80+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
81+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9282
env:
9383
HCKIND: ${{ matrix.compilerKind }}
9484
HCNAME: ${{ matrix.compiler }}
@@ -100,20 +90,13 @@ jobs:
10090
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
10191
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
10292
HCDIR=/opt/$HCKIND/$HCVER
103-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
104-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
105-
echo "HC=$HC" >> "$GITHUB_ENV"
106-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
107-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
108-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
109-
else
110-
HC=$HCDIR/bin/$HCKIND
111-
echo "HC=$HC" >> "$GITHUB_ENV"
112-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
113-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
114-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
115-
fi
116-
93+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
94+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
95+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
96+
echo "HC=$HC" >> "$GITHUB_ENV"
97+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
98+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
99+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
117100
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
118101
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
119102
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -163,14 +146,14 @@ jobs:
163146
- name: install cabal-plan
164147
run: |
165148
mkdir -p $HOME/.cabal/bin
166-
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
167-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
149+
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
150+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
168151
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
169152
rm -f cabal-plan.xz
170153
chmod a+x $HOME/.cabal/bin/cabal-plan
171154
cabal-plan --version
172155
- name: checkout
173-
uses: actions/checkout@v2
156+
uses: actions/checkout@v4
174157
with:
175158
path: source
176159
- name: initial cabal.project for sdist
@@ -198,15 +181,15 @@ jobs:
198181
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
199182
cat >> cabal.project <<EOF
200183
EOF
201-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(ixset-typed)$/; }' >> cabal.project.local
184+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(ixset-typed)$/; }' >> cabal.project.local
202185
cat cabal.project
203186
cat cabal.project.local
204187
- name: dump install plan
205188
run: |
206189
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
207190
cabal-plan
208-
- name: cache
209-
uses: actions/cache@v2
191+
- name: restore cache
192+
uses: actions/cache/restore@v4
210193
with:
211194
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
212195
path: ~/.cabal/store
@@ -230,8 +213,14 @@ jobs:
230213
${CABAL} -vnormal check
231214
- name: haddock
232215
run: |
233-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
216+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
234217
- name: unconstrained build
235218
run: |
236219
rm -f cabal.project.local
237220
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
221+
- name: save cache
222+
uses: actions/cache/save@v4
223+
if: always()
224+
with:
225+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
226+
path: ~/.cabal/store

‎ixset-typed.cabal

+8-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@ category: Data Structures
2626
build-type: Simple
2727
cabal-version: >= 1.10
2828
extra-source-files: CHANGELOG.md
29-
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.2
29+
tested-with: GHC == 8.0.2,
30+
GHC == 8.2.2,
31+
GHC == 8.4.4,
32+
GHC == 8.6.5,
33+
GHC == 8.8.4,
34+
GHC == 8.10.7,
35+
GHC == 9.0.2,
36+
GHC == 9.2.8
3037

3138
source-repository head
3239
type: git

0 commit comments

Comments
 (0)
Please sign in to comment.