From d3124ff6c60e501e36a598f0ccea75cda7a3fc13 Mon Sep 17 00:00:00 2001 From: Brent Yorgey Date: Mon, 8 Jan 2024 08:24:05 -0600 Subject: [PATCH] Upper bound updates - Allow `base-4.19` (GHC 9.8) & update CI - Allow `text-2.1` --- .github/workflows/haskell-ci.yml | 37 +++++++++++++++++++------------- .travis.yml | 36 ------------------------------- diagrams-lib.cabal | 6 +++--- 3 files changed, 25 insertions(+), 54 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 2aaf76fe..78e491f9 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.16.6 +# version: 0.17.20231203 # -# REGENDATA ("0.16.6",["github","diagrams-lib.cabal"]) +# REGENDATA ("0.17.20231203",["github","diagrams-lib.cabal"]) # name: Haskell-CI on: @@ -28,14 +28,19 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.6.2 + - compiler: ghc-9.8.1 compilerKind: ghc - compilerVersion: 9.6.2 + compilerVersion: 9.8.1 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.5 + - compiler: ghc-9.6.3 compilerKind: ghc - compilerVersion: 9.4.5 + compilerVersion: 9.6.3 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.4.8 + compilerKind: ghc + compilerVersion: 9.4.8 setup-method: ghcup allow-failure: false - compiler: ghc-9.2.8 @@ -76,18 +81,18 @@ jobs: apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 if [ "${{ matrix.setup-method }}" = ghcup ]; then mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.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.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) else apt-add-repository -y 'ppa:hvr/ghc' apt-get update apt-get install -y "$HCNAME" mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) fi env: HCKIND: ${{ matrix.compilerKind }} @@ -101,17 +106,19 @@ jobs: echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" HCDIR=/opt/$HCKIND/$HCVER if [ "${{ matrix.setup-method }}" = ghcup ]; then - HC=$HOME/.ghcup/bin/$HCKIND-$HCVER + HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") + HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') + HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') echo "HC=$HC" >> "$GITHUB_ENV" - echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV" - echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$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" else HC=$HCDIR/bin/$HCKIND echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV" echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" fi HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 727e80df..00000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -language: haskell - -env: - matrix: - - GHCVER=7.10.3 CABALVER=1.22 - - GHCVER=8.0.2 CABALVER=1.24 - - GHCVER=8.2.2 CABALVER=2.0 - - GHCVER=8.4.3 CABALVER=2.2 - - GHCVER=8.6.5 CABALVER=2.4 - - GHCVER=8.8.1 CABALVER=3.0 - - GHCVER=head CABALVER=head - global: - - HEAD_DEPS="diagrams-core diagrams-solve monoid-extras" - -matrix: - allow_failures: - - env: GHCVER=head CABALVER=head - -before_install: - - git clone http://github.com/diagrams/diagrams-travis travis - - source travis/scripts/set_env.sh - - ./travis/scripts/before_install.sh - -install: ./travis/scripts/install.sh - -script: ./travis/scripts/script.sh - - -notifications: - email: false - irc: - channels: - - irc.freenode.org#diagrams - skip_join: true - template: - - "\x0313diagrams-lib\x03/\x0306%{branch}\x03 \x0314%{commit}\x03 %{build_url} %{message}" diff --git a/diagrams-lib.cabal b/diagrams-lib.cabal index fc62447e..64d6a16b 100644 --- a/diagrams-lib.cabal +++ b/diagrams-lib.cabal @@ -21,7 +21,7 @@ Build-type: Simple Cabal-version: 1.18 Extra-source-files: diagrams/*.svg Extra-doc-files: CHANGELOG.md, README.markdown, diagrams/*.svg -Tested-with: GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.5 || ==9.6.2 +Tested-with: GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.3 || ==9.8.1 Source-repository head type: git location: http://github.com/diagrams/diagrams-lib.git @@ -100,7 +100,7 @@ Library Diagrams.TwoD.Types, Diagrams.TwoD.Vector, Diagrams.Util - Build-depends: base >= 4.9 && < 4.19, + Build-depends: base >= 4.9 && < 4.20, containers >= 0.3 && < 0.7, array >= 0.3 && < 0.6, semigroups >= 0.3.4 && < 0.21, @@ -126,7 +126,7 @@ Library fsnotify >= 0.4 && < 0.5, directory >= 1.2 && < 1.4, unordered-containers >= 0.2 && < 0.3, - text >= 0.7.1 && < 2.1, + text >= 0.7.1 && < 2.2, mtl >= 2.0 && < 2.3 || >= 2.3.1 && < 2.4, transformers >= 0.3.0 && < 0.7.0, profunctors >= 5.0 && < 6.0,