@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.16.6
11+# version: 0.17.20231110
1212#
13−# REGENDATA ("0.16.6",["github","cabal.project"])
13+# REGENDATA ("0.17.20231110",["github","cabal.project"])
1414#
1515name: Haskell-CI
1616on:
@@ -38,14 +38,19 @@ jobs:
3838 strategy:
3939 matrix:
4040 include:
41− - compiler: ghc-9.6.2
41+ - compiler: ghc-9.8.1
4242 compilerKind: ghc
43− compilerVersion: 9.6.2
43+ compilerVersion: 9.8.1
4444 setup-method: ghcup
4545 allow-failure: false
46− - compiler: ghc-9.4.5
46+ - compiler: ghc-9.6.3
4747 compilerKind: ghc
48− compilerVersion: 9.4.5
48+ compilerVersion: 9.6.3
49+ setup-method: ghcup
50+ allow-failure: false
51+ - compiler: ghc-9.4.8
52+ compilerKind: ghc
53+ compilerVersion: 9.4.8
4954 setup-method: ghcup
5055 allow-failure: false
5156 - compiler: ghc-9.2.8
@@ -81,18 +86,18 @@ jobs:
8186 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8287 if [ "${{ matrix.setup-method }}" = ghcup ]; then
8388 mkdir -p "$HOME/.ghcup/bin"
84− curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
89+ curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
8590 chmod a+x "$HOME/.ghcup/bin/ghcup"
8691 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
87− "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
92+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8893 else
8994 apt-add-repository -y 'ppa:hvr/ghc'
9095 apt-get update
9196 apt-get install -y "$HCNAME"
9297 mkdir -p "$HOME/.ghcup/bin"
93− curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
98+ curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
9499 chmod a+x "$HOME/.ghcup/bin/ghcup"
95− "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
96101 fi
97102 env:
98103 HCKIND: ${{ matrix.compilerKind }}
@@ -106,17 +111,19 @@ jobs:
106111 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
107112 HCDIR=/opt/$HCKIND/$HCVER
108113 if [ "${{ matrix.setup-method }}" = ghcup ]; then
109− HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
114+ HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
115+ HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
116+ HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
110117 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.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
118+ echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
119+ echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
120+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
114121 else
115122 HC=$HCDIR/bin/$HCKIND
116123 echo "HC=$HC" >> "$GITHUB_ENV"
117124 echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
118125 echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
119− echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
126+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
120127 fi
121128
122129 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')