diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 8f1c2a1..e8a1940 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.20240708 # -# REGENDATA ("0.17.20231203",["github","diagrams-builder.cabal"]) +# REGENDATA ("0.19.20240708",["github","diagrams-builder.cabal"]) # name: Haskell-CI on: @@ -23,19 +23,19 @@ 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.8.2 compilerKind: ghc - compilerVersion: 9.8.1 + compilerVersion: 9.8.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.3 + - compiler: ghc-9.6.5 compilerKind: ghc - compilerVersion: 9.6.3 + compilerVersion: 9.6.5 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.8 @@ -65,10 +65,10 @@ jobs: apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) apt-get update apt-get install -y libcairo2-dev libpango1.0-dev env: @@ -88,7 +88,7 @@ jobs: echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" @@ -145,7 +145,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 @@ -174,7 +174,7 @@ jobs: cat >> cabal.project <> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(diagrams-builder)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan @@ -182,7 +182,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 @@ -209,7 +209,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/diagrams-builder.cabal b/diagrams-builder.cabal index eace78c..60a909c 100644 --- a/diagrams-builder.cabal +++ b/diagrams-builder.cabal @@ -37,7 +37,7 @@ maintainer: diagrams-discuss@googlegroups.com category: Graphics build-type: Simple cabal-version: >=1.10 -tested-with: GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.3 || ==9.8.1 +tested-with: GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2 bug-reports: https://github.com/diagrams/diagrams-builder/issues Source-repository head type: git @@ -54,14 +54,14 @@ library diagrams-lib >= 1.4 && < 1.5, hint >= 0.4 && < 0.10, directory >= 1.3 && < 1.4, - filepath >= 1.4 && < 1.5, + filepath >= 1.4 && < 1.6, transformers >= 0.3 && < 0.7, split >= 0.2 && < 0.3, haskell-src-exts >= 1.18 && < 1.24, haskell-src-exts-simple >= 1.18 && < 1.24, cmdargs >= 0.6 && < 0.11, - lens >= 4.0 && < 5.3, - hashable >= 1.1 && < 1.5, + lens >= 4.0 && < 5.4, + hashable >= 1.1 && < 1.6, exceptions >= 0.3 && < 0.11 hs-source-dirs: src default-language: Haskell2010 @@ -118,7 +118,7 @@ executable diagrams-builder-cairo diagrams-lib >= 1.4 && < 1.5, diagrams-cairo >= 1.4 && < 1.5, cmdargs >= 0.6 && < 0.11, - lens >= 4.0 && < 5.3 + lens >= 4.0 && < 5.4 executable diagrams-builder-svg main-is: diagrams-builder-svg.hs @@ -159,7 +159,7 @@ executable diagrams-builder-ps diagrams-lib >= 1.4 && < 1.5, diagrams-postscript >= 1.4 && < 1.6, cmdargs >= 0.6 && < 0.11, - lens >= 3.8 && < 5.3, + lens >= 3.8 && < 5.4, bytestring >= 0.9.2 && < 0.13 executable diagrams-builder-rasterific @@ -180,7 +180,7 @@ executable diagrams-builder-rasterific diagrams-lib >= 1.4 && < 1.5, diagrams-rasterific >= 1.4 && < 1.5, cmdargs >= 0.6 && < 0.11, - lens >= 3.8 && < 5.3, + lens >= 3.8 && < 5.4, JuicyPixels >= 3.1.5 && < 3.4 executable diagrams-builder-pgf @@ -202,5 +202,5 @@ executable diagrams-builder-pgf diagrams-pgf >= 1.4 && < 1.5, bytestring >= 0.10.2 && < 0.13, cmdargs >= 0.6 && < 0.11, - lens >= 3.8 && < 5.3, + lens >= 3.8 && < 5.4, texrunner