Skip to content

Commit baa12d9

Browse files
Bodigrimtreeowl
authored andcommitted
Regenerate CI
1 parent bda0282 commit baa12d9

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 11 additions & 5 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.13.20211030
11+
# version: 0.14.3
1212
#
13-
# REGENDATA ("0.13.20211030",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.14.3",["github","--config=cabal.haskell-ci","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -24,6 +24,8 @@ jobs:
2424
linux:
2525
name: Haskell-CI - Linux - ${{ matrix.compiler }}
2626
runs-on: ubuntu-18.04
27+
timeout-minutes:
28+
60
2729
container:
2830
image: buildpack-deps:bionic
2931
continue-on-error: ${{ matrix.allow-failure }}
@@ -78,7 +80,7 @@ jobs:
7880
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
7981
if [ "${{ matrix.setup-method }}" = ghcup ]; then
8082
mkdir -p "$HOME/.ghcup/bin"
81-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
83+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
8284
chmod a+x "$HOME/.ghcup/bin/ghcup"
8385
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
8486
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
@@ -87,7 +89,7 @@ jobs:
8789
apt-get update
8890
apt-get install -y "$HCNAME"
8991
mkdir -p "$HOME/.ghcup/bin"
90-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
92+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
9193
chmod a+x "$HOME/.ghcup/bin/ghcup"
9294
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
9395
fi
@@ -119,7 +121,7 @@ jobs:
119121
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
120122
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
121123
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
122-
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" ; else echo "ARG_BENCH=--disable-benchmarks" >> "$GITHUB_ENV" ; fi
124+
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
123125
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
124126
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
125127
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
@@ -149,6 +151,10 @@ jobs:
149151
repository hackage.haskell.org
150152
url: http://hackage.haskell.org/
151153
EOF
154+
cat >> $CABAL_CONFIG <<EOF
155+
program-default-options
156+
ghc-options: $GHCJOBS +RTS -M3G -RTS
157+
EOF
152158
cat $CABAL_CONFIG
153159
- name: versions
154160
run: |

cabal.haskell-ci

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ install-dependencies: False
1313
-- depends on containers
1414
installed: +all -binary -text -ghc-heap
1515

16-
-- gauge works only with newer GHC, and not with GHC 9.2 yet.
17-
benchmarks: >=7.8.4 && < 9.2
18-
1916
haddock: >= 8.2
2017

2118
cabal-check: False

0 commit comments

Comments
 (0)