diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 34cf08e..1236ede 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/andreasabel/haskell-ci # -# version: 0.19.20240416 +# version: 0.19.20240517 # -# REGENDATA ("0.19.20240416",["github","cabal.project"]) +# REGENDATA ("0.19.20240517",["github","cabal.project"]) # name: Haskell-CI on: @@ -27,14 +27,14 @@ jobs: timeout-minutes: 60 container: - image: buildpack-deps:focal + image: buildpack-deps:jammy continue-on-error: ${{ matrix.allow-failure }} strategy: matrix: include: - - compiler: ghc-9.10.0.20240413 + - compiler: ghc-9.10.1 compilerKind: ghc - compilerVersion: 9.10.0.20240413 + compilerVersion: 9.10.1 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.2 @@ -42,9 +42,9 @@ jobs: compilerVersion: 9.8.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.4 + - compiler: ghc-9.6.5 compilerKind: ghc - compilerVersion: 9.6.4 + compilerVersion: 9.6.5 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.8 @@ -101,7 +101,6 @@ jobs: mkdir -p "$HOME/.ghcup/bin" curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml; "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) "$HOME/.ghcup/bin/ghcup" install cabal 3.10.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: @@ -126,7 +125,7 @@ jobs: echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" - if [ $((HCNUMVER >= 91000)) -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: @@ -155,18 +154,6 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF - if $HEADHACKAGE; then - cat >> $CABAL_CONFIG <> $CABAL_CONFIG <= 80200)) -ne 0 ] ; then echo "package cryptohash-sha512" >> cabal.project ; fi if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi cat >> cabal.project <> cabal.project - fi - $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(cryptohash-sha512)$/; }' >> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(cryptohash-sha512)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan @@ -259,16 +242,6 @@ jobs: run: | rm -f cabal.project.local $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all - - name: prepare for constraint sets - run: | - rm -f cabal.project.local - - name: constraint set bytestring-0.12 - run: | - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ==0.12.*' all --dry-run ; fi - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then cabal-plan topo | sort ; fi - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ==0.12.*' --dependencies-only -j2 all ; fi - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ==0.12.*' all ; fi - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ==0.12.*' all ; fi - name: save cache uses: actions/cache/save@v4 if: always() diff --git a/.github/workflows/simple.yml b/.github/workflows/simple.yml index e6fba49..91ec9c4 100644 --- a/.github/workflows/simple.yml +++ b/.github/workflows/simple.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [macos-latest, windows-latest] - ghc: ['9.2','9.4','9.6','9.8'] + ghc: ['9.2','9.4','9.6','9.8','9.10'] fail-fast: false timeout-minutes: 60 diff --git a/cabal.haskell-ci b/cabal.haskell-ci index d95a2ea..fe64e4f 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,10 +1,10 @@ branches: master -constraint-set bytestring-0.12 - constraints: bytestring ==0.12.* - ghc: >=8.2 - tests: True - run-tests: True +-- constraint-set bytestring-0.12 +-- constraints: bytestring ==0.12.* +-- ghc: >=8.2 +-- tests: True +-- run-tests: True -raw-project - allow-newer: bytestring \ No newline at end of file +-- raw-project +-- allow-newer: bytestring \ No newline at end of file diff --git a/cryptohash-sha512.cabal b/cryptohash-sha512.cabal index 2197bef..1ac5044 100644 --- a/cryptohash-sha512.cabal +++ b/cryptohash-sha512.cabal @@ -1,7 +1,7 @@ cabal-version: 2.0 name: cryptohash-sha512 version: 0.11.102.0 -x-revision: 3 +x-revision: 4 synopsis: Fast, pure and practical SHA-512 implementation description: { @@ -54,9 +54,9 @@ category: Data, Cryptography build-type: Simple tested-with: - GHC == 9.10.0 + GHC == 9.10.1 GHC == 9.8.2 - GHC == 9.6.4 + GHC == 9.6.5 GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2 @@ -66,7 +66,6 @@ tested-with: GHC == 8.4.4 GHC == 8.2.2 GHC == 8.0.2 - -- GHC == 7.10.3 extra-source-files: cbits/hs_sha512.h changelog.md @@ -116,7 +115,7 @@ test-suite test-sha512t , base16-bytestring >= 1.0.1.0 && < 1.1 , SHA >= 1.6.4 && < 1.7 , tasty >= 1.4 && < 1.6 - , tasty-quickcheck >= 0.10 && < 0.11 + , tasty-quickcheck >= 0.10 && < 1 , tasty-hunit >= 0.10 && < 0.11 test-suite test-sha384 @@ -132,7 +131,7 @@ test-suite test-sha384 , base16-bytestring >= 1.0.1.0 && < 1.1 , SHA >= 1.6.4 && < 1.7 , tasty >= 1.4 && < 1.6 - , tasty-quickcheck >= 0.10 && < 0.11 + , tasty-quickcheck >= 0.10 && < 1 , tasty-hunit >= 0.10 && < 0.11 benchmark bench-sha512