From 1c43678e6c801f7e05f837ad76b974178efe9f66 Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Sun, 12 May 2024 15:51:09 +0100 Subject: [PATCH] Update CI to use GHC 9.10.1 Hopefully --- .github/workflows/haskell-ci.yml | 33 +++++++++++++++++++++++--------- ghc-exactprint.cabal | 2 +- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 70bf7f11..a8b85ad1 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.20231219 +# version: 0.19.20240501 # -# REGENDATA ("0.17.20231219",["github","ghc-exactprint.cabal","--ghcup-jobs"]) +# REGENDATA ("0.19.20240501",["github","ghc-exactprint.cabal","--ghcup-jobs"]) # name: Haskell-CI on: @@ -23,14 +23,14 @@ 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.8.1 + - compiler: ghc-9.10.0.20240426 compilerKind: ghc - compilerVersion: 9.8.1 + compilerVersion: 9.10.0.20240426 setup-method: ghcup allow-failure: false fail-fast: false @@ -66,7 +66,7 @@ jobs: echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" - echo "HEADHACKAGE=false" >> "$GITHUB_ENV" + echo "HEADHACKAGE=true" >> "$GITHUB_ENV" echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" echo "GHCJSARITH=0" >> "$GITHUB_ENV" env: @@ -95,6 +95,18 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF + if $HEADHACKAGE; then + cat >> $CABAL_CONFIG <> $CABAL_CONFIG <> cabal.project cat >> cabal.project <> cabal.project + fi $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(ghc-exactprint)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local @@ -154,7 +169,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 @@ -184,7 +199,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-exactprint.cabal b/ghc-exactprint.cabal index 75490200..e3354d23 100644 --- a/ghc-exactprint.cabal +++ b/ghc-exactprint.cabal @@ -6,7 +6,7 @@ description: Using the API Annotations available from GHC 9.2.1, this library provides a means to round trip any code that can be compiled by GHC, currently excluding lhs files. . - Note: requires GHC 9.8.*. For earlier GHC + Note: requires GHC 9.10.*. For earlier GHC versions see lower version numbers. .