Skip to content

Commit 1daad17

Browse files
committed
Bump CI to GHC 9.2.3 and restrict to master branch
1 parent 10d14a2 commit 1daad17

File tree

4 files changed

+30
-16
lines changed

4 files changed

+30
-16
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,24 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.14.3.20220416
11+
# version: 0.15.20220710
1212
#
13-
# REGENDATA ("0.14.3.20220416",["github","hackage-server.cabal"])
13+
# REGENDATA ("0.15.20220710",["github","hackage-server.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
17-
- push
18-
- pull_request
17+
push:
18+
branches:
19+
- master
20+
- ci*
21+
pull_request:
22+
branches:
23+
- master
24+
- ci*
1925
jobs:
2026
linux:
2127
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22-
runs-on: ubuntu-18.04
28+
runs-on: ubuntu-20.04
2329
timeout-minutes:
2430
60
2531
container:
@@ -28,9 +34,9 @@ jobs:
2834
strategy:
2935
matrix:
3036
include:
31-
- compiler: ghc-9.2.2
37+
- compiler: ghc-9.2.3
3238
compilerKind: ghc
33-
compilerVersion: 9.2.2
39+
compilerVersion: 9.2.3
3440
setup-method: ghcup
3541
allow-failure: false
3642
- compiler: ghc-9.0.2
@@ -56,20 +62,20 @@ jobs:
5662
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
5763
if [ "${{ matrix.setup-method }}" = ghcup ]; then
5864
mkdir -p "$HOME/.ghcup/bin"
59-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
65+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
6066
chmod a+x "$HOME/.ghcup/bin/ghcup"
61-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
62-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
67+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
68+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
6369
apt-get update
6470
apt-get install -y libbrotli-dev
6571
else
6672
apt-add-repository -y 'ppa:hvr/ghc'
6773
apt-get update
6874
apt-get install -y "$HCNAME" libbrotli-dev
6975
mkdir -p "$HOME/.ghcup/bin"
70-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
76+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
7177
chmod a+x "$HOME/.ghcup/bin/ghcup"
72-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
78+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
7379
fi
7480
env:
7581
HCKIND: ${{ matrix.compilerKind }}
@@ -212,7 +218,7 @@ jobs:
212218
${CABAL} -vnormal check
213219
- name: haddock
214220
run: |
215-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
221+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
216222
- name: unconstrained build
217223
run: |
218224
rm -f cabal.project.local

.github/workflows/nix-shell.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
name: "Test nix-shell"
22
on:
3-
- push
4-
- pull_request
3+
push:
4+
branches:
5+
- master
6+
- ci*
7+
pull_request:
8+
branches:
9+
- master
10+
- ci*
511
jobs:
612
nix-shell:
713
runs-on: ubuntu-latest

cabal.haskell-ci

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
branches: master ci*
2+
13
installed: +all -Cabal -text -parsec
24

35
-- -- irc-channels works with GHA, but why send to a channel

hackage-server.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ copyright: 2008-2015 Duncan Coutts,
2727
license: BSD-3-Clause
2828
license-file: LICENSE
2929

30-
tested-with: GHC == { 9.2.2, 9.0.2, 8.10.7, 8.8.4 }
30+
tested-with: GHC == { 9.2.3, 9.0.2, 8.10.7, 8.8.4 }
3131

3232
data-dir: datafiles
3333
data-files:

0 commit comments

Comments
 (0)