Merge pull request #13 from haskell-hvr/ghc-9.4

Ghc 9.4

Author: phadej

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.13.20211111
+# version: 0.15.20220808
 #
-# REGENDATA ("0.13.20211111",["github","cabal.project"])
+# REGENDATA ("0.15.20220808",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -23,7 +23,7 @@ on:
 jobs:
  linux:
  name: Haskell-CI - Linux - ${{ matrix.compiler }}
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
  timeout-minutes:
   60
  container:
@@ -32,20 +32,25 @@ jobs:
  strategy:
  matrix:
  include:
- - compiler: ghc-9.2.1
+ - compiler: ghc-9.4.1
  compilerKind: ghc
- compilerVersion: 9.2.1
+ compilerVersion: 9.4.1
  setup-method: ghcup
  allow-failure: false
- - compiler: ghc-9.0.1
+ - compiler: ghc-9.2.4
  compilerKind: ghc
- compilerVersion: 9.0.1
- setup-method: hvr-ppa
+ compilerVersion: 9.2.4
+ setup-method: ghcup
  allow-failure: false
- - compiler: ghc-8.10.4
+ - compiler: ghc-9.0.2
  compilerKind: ghc
- compilerVersion: 8.10.4
- setup-method: hvr-ppa
+ compilerVersion: 9.0.2
+ setup-method: ghcup
+ allow-failure: false
+ - compiler: ghc-8.10.7
+ compilerKind: ghc
+ compilerVersion: 8.10.7
+ setup-method: ghcup
  allow-failure: false
  - compiler: ghc-8.8.4
  compilerKind: ghc
@@ -100,18 +105,18 @@ jobs:
  apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
  if [ "${{ matrix.setup-method }}" = ghcup ]; then
  mkdir -p "$HOME/.ghcup/bin"
- curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
+ curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
  chmod a+x "$HOME/.ghcup/bin/ghcup"
- "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
- "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
+ "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
  else
  apt-add-repository -y 'ppa:hvr/ghc'
  apt-get update
  apt-get install -y "$HCNAME"
  mkdir -p "$HOME/.ghcup/bin"
- curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
+ curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
  chmod a+x "$HOME/.ghcup/bin/ghcup"
- "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
  fi
  env:
  HCKIND: ${{ matrix.compilerKind }}
@@ -254,7 +259,7 @@ jobs:
  ${CABAL} -vnormal check
  - name: haddock
  run: |
- $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+ $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
  - name: unconstrained build
  run: |
  rm -f cabal.project.local

.github/workflows/simple.yml

@@ -0,0 +1,48 @@
+name: Simple
+on:
+ push:
+ branches:
+ - master
+ pull_request:
+ branches:
+ - master
+
+jobs:
+ native:
+ name: "Simple: GHC ${{ matrix.ghc }} on ${{ matrix.os }}"
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [macos-latest, windows-latest]
+ ghc: ['8.10','9.0','9.2','9.4.1']
+ fail-fast: false
+ timeout-minutes:
+  60
+ steps:
+ - name: Set git to use LF
+ run: |
+ git config --global core.autocrlf false
+ git config --global core.eol lf
+
+ - name: Checkout
+ uses: actions/checkout@v3.0.2
+
+ - name: Set up Haskell
+ id: setup-haskell
+ uses: haskell/actions/setup@v1
+ with:
+ ghc-version: ${{ matrix.ghc }}
+ cabal-version: '3.8.1.0'
+
+ - name: Cache
+ uses: actions/cache@v2.1.3
+ with:
+ path: ${{ steps.setup-haskell.outputs.cabal-store }}
+ key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
+ restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
+
+ - name: Build
+ run: cabal build all --enable-tests
+
+ - name: Test
+ run: cabal test all --enable-tests --test-show-details=direct

cabal.haskell-ci

@@ -1,5 +1,4 @@
 branches: master
-ghcup-jobs: >=9.2
 benchmarks: >=7.6
 tests: >=7.6
 

cryptohash-sha512.cabal

@@ -1,5 +1,6 @@
 name: cryptohash-sha512
 version: 0.11.101.0
+x-revision: 1
 description:
  A practical incremental and one-pass, pure API to the
  <https://en.wikipedia.org/wiki/SHA-2 SHA-512 hash algorithm>
@@ -35,9 +36,10 @@ tested-with: GHC == 7.4.2
  , GHC == 8.4.4
  , GHC == 8.6.5
  , GHC == 8.8.4
- , GHC == 8.10.4
- , GHC == 9.0.1
- , GHC == 9.2.1
+ , GHC == 8.10.7
+ , GHC == 9.0.2
+ , GHC == 9.2.4
+ , GHC == 9.4.1
 
 extra-source-files: cbits/sha512.h
  changelog.md
@@ -48,7 +50,7 @@ source-repository head
 
 library
  default-language: Haskell2010
- build-depends: base >= 4.5 && < 4.17
+ build-depends: base >= 4.5 && < 4.18
  , bytestring >= 0.9.2 && < 0.12
 
  hs-source-dirs: src
@@ -82,4 +84,4 @@ benchmark bench-sha512
  build-depends: cryptohash-sha512
  , base
  , bytestring
- , criterion >= 1.5 && <1.6
+ , criterion >= 1.5 && <1.7