diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index b14d7b1..d1c151b 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.13.20211029 +# version: 0.13.20211030 # -# REGENDATA ("0.13.20211029",["github","cabal.project"]) +# REGENDATA ("0.13.20211030",["github","cabal.project"]) # name: Haskell-CI on: @@ -34,7 +34,7 @@ jobs: compilerKind: ghc compilerVersion: 9.2.1 setup-method: ghcup - allow-failure: true + allow-failure: false - compiler: ghc-9.0.1 compilerKind: ghc compilerVersion: 9.0.1 @@ -140,7 +140,7 @@ jobs: echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" - if [ $((HCNUMVER >= 90200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi + echo "HEADHACKAGE=false" >> "$GITHUB_ENV" echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" echo "GHCJSARITH=0" >> "$GITHUB_ENV" env: @@ -169,17 +169,6 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF - if $HEADHACKAGE; then - cat >> $CABAL_CONFIG <> cabal.project <> cabal.project - fi $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(time-compat)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local diff --git a/time-compat.cabal b/time-compat.cabal index 103871d..ab6d36d 100644 --- a/time-compat.cabal +++ b/time-compat.cabal @@ -1,7 +1,7 @@ cabal-version: 1.12 name: time-compat version: 1.9.6.1 -x-revision: 1 +x-revision: 2 synopsis: Compatibility package for time description: This packages tries to compat as much of @time@ features as possible. @@ -59,7 +59,7 @@ library , base-orphans >=0.8.4 && <0.9 , deepseq >=1.3.0.0 && <1.4 || >=1.4.1.1 && <1.5 , time >=1.4 && <1.7 || >=1.8 && <1.9 || >=1.9.2 && <1.9.4 || >=1.10 && <1.10.1 || >=1.11 && <1.11.2 || >=1.12 && <1.13 - , hashable >=1.3.2.0 && <1.4 + , hashable >=1.3.2.0 && <1.5 if flag(old-locale) build-depends: