diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 01e2d9c..9f0982c 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.20231203 +# version: 0.19.20240514 # -# REGENDATA ("0.17.20231203",["github","ghc-events.cabal"]) +# REGENDATA ("0.19.20240514",["github","ghc-events.cabal"]) # name: Haskell-CI on: @@ -23,11 +23,16 @@ jobs: timeout-minutes: 60 container: - image: buildpack-deps:bionic + image: buildpack-deps:jammy continue-on-error: ${{ matrix.allow-failure }} strategy: matrix: include: + - compiler: ghc-9.10.1 + compilerKind: ghc + compilerVersion: 9.10.1 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.8.1 compilerKind: ghc compilerVersion: 9.8.1 @@ -187,7 +192,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan cabal-plan --version - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: source - name: initial cabal.project for sdist @@ -215,7 +220,7 @@ jobs: if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(ghc-events)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan @@ -223,7 +228,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all cabal-plan - name: restore cache - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} path: ~/.cabal/store @@ -253,7 +258,7 @@ jobs: rm -f cabal.project.local $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all - name: save cache - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 if: always() with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} diff --git a/ghc-events.cabal b/ghc-events.cabal index 557669a..6c80d86 100644 --- a/ghc-events.cabal +++ b/ghc-events.cabal @@ -32,6 +32,7 @@ tested-with: GHC == 8.0.2 GHC == 9.4.2 GHC == 9.6.1 GHC == 9.8.1 + GHC == 9.10.1 extra-source-files: include/EventLogFormat.h test/*.eventlog test/*.reference @@ -54,7 +55,7 @@ common default library import: default - build-depends: base >= 4.7 && < 4.20, + build-depends: base >= 4.7 && < 4.21, containers >= 0.5 && < 0.8, binary >= 0.7 && < 0.11, bytestring >= 0.10.4,