diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 7460bf7..c76f1fc 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.20240429 # -# REGENDATA ("0.19.20240416",["github","filelock.cabal"]) +# REGENDATA ("0.19.20240429",["github","filelock.cabal"]) # 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.0.20240426 compilerKind: ghc - compilerVersion: 9.10.0.20240413 + compilerVersion: 9.10.0.20240426 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 diff --git a/.github/workflows/mac-win.yml b/.github/workflows/mac-win.yml index daadaf4..4897e4e 100644 --- a/.github/workflows/mac-win.yml +++ b/.github/workflows/mac-win.yml @@ -3,11 +3,9 @@ on: push: branches: - master - - ci-* pull_request: branches: - master - - ci-* jobs: mac-win: @@ -23,13 +21,7 @@ jobs: - uses: actions/checkout@v3 - - name: Info about Haskell versions - run: | - ghc --version - cabal --version - - - name: Update cabal package repository - run: cabal update + - uses: haskell-actions/setup@latest - name: Build run: cabal build diff --git a/filelock.cabal b/filelock.cabal index e650c56..dcc09b9 100644 --- a/filelock.cabal +++ b/filelock.cabal @@ -19,7 +19,7 @@ extra-source-files: tested-with: GHC == 9.10.0 GHC == 9.8.2 - GHC == 9.6.4 + GHC == 9.6.5 GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2