From 1609207ce9a2bf0351446ef56744adb8c25f0608 Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Sat, 7 Oct 2023 14:11:38 +0200 Subject: [PATCH] Updated CI --- .github/workflows/haskell-ci.yml | 21 +++++++++++---------- cabal.haskell-ci | 2 +- typed-process-effectful.cabal | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 48b0c34..8fcbebe 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.17.20230811 +# version: 0.17.20231004 # -# REGENDATA ("0.17.20230811",["github","cabal.project"]) +# REGENDATA ("0.17.20231004",["github","cabal.project"]) # name: Haskell-CI on: @@ -32,19 +32,19 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.6.1 + - compiler: ghc-9.6.3 compilerKind: ghc - compilerVersion: 9.6.1 + compilerVersion: 9.6.3 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.4 + - compiler: ghc-9.4.7 compilerKind: ghc - compilerVersion: 9.4.4 + compilerVersion: 9.4.7 setup-method: ghcup allow-failure: false - - compiler: ghc-9.2.7 + - compiler: ghc-9.2.8 compilerKind: ghc - compilerVersion: 9.2.7 + compilerVersion: 9.2.8 setup-method: ghcup allow-failure: false - compiler: ghc-9.0.2 @@ -66,6 +66,7 @@ jobs: mkdir -p "$HOME/.ghcup/bin" curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$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.7.yaml; "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: @@ -135,7 +136,7 @@ jobs: - name: cache (tools) uses: actions/cache/restore@v3 with: - key: ${{ runner.os }}-${{ matrix.compiler }}-tools-2ac3c456 + key: ${{ runner.os }}-${{ matrix.compiler }}-tools-2bcd4d44 path: ~/.haskell-ci-tools - name: install cabal-plan run: | @@ -160,7 +161,7 @@ jobs: uses: actions/cache/save@v3 if: always() with: - key: ${{ runner.os }}-${{ matrix.compiler }}-tools-2ac3c456 + key: ${{ runner.os }}-${{ matrix.compiler }}-tools-2bcd4d44 path: ~/.haskell-ci-tools - name: checkout uses: actions/checkout@v3 diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 694fe24..5aebfa5 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -2,7 +2,7 @@ branches: main doctest: <9.3 hlint: True -hlint-job: 9.4.4 +hlint-job: 9.4.7 hlint-version: >=3.3 && <3.6 tests: True benchmarks: True diff --git a/typed-process-effectful.cabal b/typed-process-effectful.cabal index 6ed7b28..78a3e4a 100644 --- a/typed-process-effectful.cabal +++ b/typed-process-effectful.cabal @@ -28,7 +28,7 @@ extra-doc-files: LICENSE.md README.md -tested-with: GHC ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.4 || ==9.6.1 +tested-with: GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.7 || ==9.6.3 source-repository head type: git