on master help sign in
Update CI
commit2ec4a629a4372f9cda22eca75de9ae9cf251adf1 authorAndrzej Rybczak <andrzej@rybczak.net> dateSat 25 Sep 2021, 12:06 (5 years ago) parent32aad55
3 files changed+23−17
.github/workflows/haskell-ci.yml+21−15 effectful-core/effectful-core.cabal+1−1 effectful/effectful.cabal+1−1
.github/workflows/haskell-ci.yml+21−15
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.13.20210621
11+# version: 0.13.20210912
1212#
13−# REGENDATA ("0.13.20210621",["github","--config=cabal.haskell-ci","cabal.project"])
13+# REGENDATA ("0.13.20210912",["github","--config=cabal.haskell-ci","cabal.project"])
1414#
1515name: Haskell-CI
1616on:
@@ -30,9 +30,9 @@ jobs:
3030 strategy:
3131 matrix:
3232 include:
33− - compiler: ghc-9.2.0.20210422
33+ - compiler: ghc-9.2.0.20210821
3434 compilerKind: ghc
35− compilerVersion: 9.2.0.20210422
35+ compilerVersion: 9.2.0.20210821
3636 setup-method: ghcup
3737 allow-failure: true
3838 - compiler: ghc-9.0.1
@@ -40,9 +40,9 @@ jobs:
4040 compilerVersion: 9.0.1
4141 setup-method: hvr-ppa
4242 allow-failure: false
43− - compiler: ghc-8.10.4
43+ - compiler: ghc-8.10.7
4444 compilerKind: ghc
45− compilerVersion: 8.10.4
45+ compilerVersion: 8.10.7
4646 setup-method: hvr-ppa
4747 allow-failure: false
4848 - compiler: ghc-8.8.4
@@ -58,14 +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.14.1/x86_64-linux-ghcup-0.1.14.1 > "$HOME/.ghcup/bin/ghcup"
61+ curl -sL https://downloads.haskell.org/ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2 > "$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.4.0.0
64+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.0.0
6565 else
6666 apt-add-repository -y 'ppa:hvr/ghc'
6767 apt-get update
68− apt-get install -y "$HCNAME" cabal-install-3.4
68+ apt-get install -y "$HCNAME"
69+ 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"
71+ chmod a+x "$HOME/.ghcup/bin/ghcup"
72+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.0.0
6973 fi
7074 env:
7175 HCKIND: ${{ matrix.compilerKind }}
@@ -83,13 +87,13 @@ jobs:
8387 echo "HC=$HC" >> "$GITHUB_ENV"
8488 echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
8589 echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
86− echo "CABAL=$HOME/.ghcup/bin/cabal-3.4.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
90+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
8791 else
8892 HC=$HCDIR/bin/$HCKIND
8993 echo "HC=$HC" >> "$GITHUB_ENV"
9094 echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
9195 echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
92− echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> "$GITHUB_ENV"
96+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
9397 fi
9498
9599 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -170,8 +174,8 @@ jobs:
170174 - name: initial cabal.project for sdist
171175 run: |
172176 touch cabal.project
173− echo "packages: $GITHUB_WORKSPACE/source/effectful" >> cabal.project
174− echo "packages: $GITHUB_WORKSPACE/source/effectful-core" >> cabal.project
177+ echo "packages: $GITHUB_WORKSPACE/source/./effectful" >> cabal.project
178+ echo "packages: $GITHUB_WORKSPACE/source/./effectful-core" >> cabal.project
175179 cat cabal.project
176180 - name: sdist
177181 run: |
@@ -232,9 +236,11 @@ jobs:
232236 - name: doctest
233237 run: |
234238 if [ $((HCNUMVER < 90200)) -ne 0 ] ; then cd ${PKGDIR_effectful} || false ; fi
235− if [ $((HCNUMVER < 90200)) -ne 0 ] ; then doctest -XBangPatterns -XConstraintKinds -XDataKinds -XDeriveFunctor -XFlexibleContexts -XFlexibleInstances -XGADTs -XGeneralizedNewtypeDeriving -XLambdaCase -XMultiParamTypeClasses -XNoStarIsType -XRankNTypes -XRecordWildCards -XRoleAnnotations -XScopedTypeVariables -XStandaloneDeriving -XStrictData -XTupleSections -XTypeApplications -XTypeFamilies -XTypeOperators src ; fi
239+ if [ $((HCNUMVER < 90200)) -ne 0 ] ; then doctest -XBangPatterns -XConstraintKinds -XDataKinds -XDeriveFunctor -XFlexibleContexts -XFlexibleInstances -XGADTs -XGeneralizedNewtypeDeriving -XLambdaCase -XMultiParamTypeClasses -XNoStarIsType -XRankNTypes -XRecordWildCards -XRoleAnnotations -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeFamilies -XTypeOperators src ; fi
240+ if [ $((HCNUMVER < 90200)) -ne 0 ] ; then cd ${PKGDIR_effectful_core} || false ; fi
241+ if [ $((HCNUMVER < 90200)) -ne 0 ] ; then doctest -XBangPatterns -XConstraintKinds -XDataKinds -XDeriveFunctor -XFlexibleContexts -XFlexibleInstances -XGADTs -XGeneralizedNewtypeDeriving -XLambdaCase -XMultiParamTypeClasses -XNoStarIsType -XRankNTypes -XRecordWildCards -XRoleAnnotations -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeFamilies -XTypeOperators src ; fi
236242 if [ $((HCNUMVER < 90200)) -ne 0 ] ; then cd ${PKGDIR_effectful_core} || false ; fi
237− if [ $((HCNUMVER < 90200)) -ne 0 ] ; then doctest -XBangPatterns -XConstraintKinds -XDataKinds -XDeriveFunctor -XFlexibleContexts -XFlexibleInstances -XGADTs -XGeneralizedNewtypeDeriving -XLambdaCase -XMultiParamTypeClasses -XNoStarIsType -XRankNTypes -XRecordWildCards -XRoleAnnotations -XScopedTypeVariables -XStandaloneDeriving -XStrictData -XTupleSections -XTypeApplications -XTypeFamilies -XTypeOperators src ; fi
243+ if [ $((HCNUMVER < 90200)) -ne 0 ] ; then doctest -XBangPatterns -XConstraintKinds -XDataKinds -XDeriveFunctor -XFlexibleContexts -XFlexibleInstances -XGADTs -XGeneralizedNewtypeDeriving -XLambdaCase -XMultiParamTypeClasses -XNoStarIsType -XRankNTypes -XRecordWildCards -XRoleAnnotations -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeFamilies -XTypeOperators utils ; fi
238244 - name: cabal check
239245 run: |
240246 cd ${PKGDIR_effectful} || false
effectful-core/effectful-core.cabal+1−1
@@ -19,7 +19,7 @@ description: An easy to use, performant extensible effects library with seamless
1919
2020extra-source-files: CHANGELOG.md
2121
22−tested-with: GHC ==8.8.4 || ==8.10.4 || ==9.0.1 || ==9.2.0.20210422
22+tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.1 || ==9.2.0.20210821
2323
2424bug-reports: https://github.com/arybczak/effectful/issues
2525source-repository head
effectful/effectful.cabal+1−1
@@ -20,7 +20,7 @@ description: An easy to use, performant extensible effects library with seamless
2020
2121extra-source-files: CHANGELOG.md
2222
23−tested-with: GHC ==8.8.4 || ==8.10.4 || ==9.0.1 || ==9.2.0.20210422
23+tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.1 || ==9.2.0.20210821
2424
2525bug-reports: https://github.com/arybczak/effectful/issues
2626source-repository head