@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.13.20210912
11+# version: 0.13.20211030
1212#
13−# REGENDATA ("0.13.20210912",["github","--config=cabal.haskell-ci","cabal.project"])
13+# REGENDATA ("0.13.20211030",["github","--config=cabal.haskell-ci","cabal.project"])
1414#
1515name: Haskell-CI
1616on:
@@ -30,11 +30,11 @@ jobs:
3030 strategy:
3131 matrix:
3232 include:
33− - compiler: ghc-9.2.0.20210821
33+ - compiler: ghc-9.2.1
3434 compilerKind: ghc
35− compilerVersion: 9.2.0.20210821
35+ compilerVersion: 9.2.1
3636 setup-method: ghcup
37− allow-failure: true
37+ allow-failure: false
3838 - compiler: ghc-9.0.1
3939 compilerKind: ghc
4040 compilerVersion: 9.0.1
@@ -58,18 +58,18 @@ jobs:
5858 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
5959 if [ "${{ matrix.setup-method }}" = ghcup ]; then
6060 mkdir -p "$HOME/.ghcup/bin"
61− curl -sL https://downloads.haskell.org/ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2 > "$HOME/.ghcup/bin/ghcup"
61+ curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
6262 chmod a+x "$HOME/.ghcup/bin/ghcup"
6363 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
64− "$HOME/.ghcup/bin/ghcup" install cabal 3.6.0.0
64+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
6565 else
6666 apt-add-repository -y 'ppa:hvr/ghc'
6767 apt-get update
6868 apt-get install -y "$HCNAME"
6969 mkdir -p "$HOME/.ghcup/bin"
70− curl -sL https://downloads.haskell.org/ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2 > "$HOME/.ghcup/bin/ghcup"
70+ curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
7171 chmod a+x "$HOME/.ghcup/bin/ghcup"
72− "$HOME/.ghcup/bin/ghcup" install cabal 3.6.0.0
72+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
7373 fi
7474 env:
7575 HCKIND: ${{ matrix.compilerKind }}
@@ -87,20 +87,20 @@ jobs:
8787 echo "HC=$HC" >> "$GITHUB_ENV"
8888 echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
8989 echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
90− echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
90+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
9191 else
9292 HC=$HCDIR/bin/$HCKIND
9393 echo "HC=$HC" >> "$GITHUB_ENV"
9494 echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
9595 echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
96− echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
96+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
9797 fi
9898
9999 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
100100 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
101101 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
102102 echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
103− if [ $((HCNUMVER >= 90200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
103+ echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
104104 echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
105105 echo "GHCJSARITH=0" >> "$GITHUB_ENV"
106106 env:
@@ -129,17 +129,6 @@ jobs:
129129 repository hackage.haskell.org
130130 url: http://hackage.haskell.org/
131131 EOF
132− if $HEADHACKAGE; then
133− cat >> $CABAL_CONFIG <<EOF
134− repository head.hackage.ghc.haskell.org
135− url: https://ghc.gitlab.haskell.org/head.hackage/
136− secure: True
137− root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
138− 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
139− f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
140− key-threshold: 3
141− EOF
142− fi
143132 cat $CABAL_CONFIG
144133 - name: versions
145134 run: |
@@ -204,9 +193,6 @@ jobs:
204193 package effectful
205194 flags: +benchmark-foreign-libraries
206195 EOF
207− if $HEADHACKAGE; then
208− echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
209− fi
210196 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(effectful|effectful-core)$/; }' >> cabal.project.local
211197 cat cabal.project
212198 cat cabal.project.local