Skip to content

Commit

Permalink
allow base-4.19, bytestring-0.12, and test on GHC 9.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@byorgey
byorgey committed Jan 15, 2024
1 parent afc7e0d commit 50ab26a
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 23 deletions.
41 changes: 24 additions & 17 deletions .github/workflows/haskell-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.16.1
# version: 0.17.20231203
#
# REGENDATA ("0.16.1",["github","diagrams-rasterific.cabal"])
# REGENDATA ("0.17.20231203",["github","diagrams-rasterific.cabal"])
#
name: Haskell-CI
on:
Expand All @@ -28,19 +28,24 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.6.1
- compiler: ghc-9.8.1
compilerKind: ghc
compilerVersion: 9.6.1
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.2.7
- compiler: ghc-9.4.8
compilerKind: ghc
compilerVersion: 9.2.7
compilerVersion: 9.4.8
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.2.8
compilerKind: ghc
compilerVersion: 9.2.8
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.0.2
Expand Down Expand Up @@ -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 }}
Expand All @@ -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))')
Expand Down
12 changes: 6 additions & 6 deletions diagrams-rasterific.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ category: Graphics
build-type: Simple
extra-source-files: fonts/*.ttf
extra-doc-files: README.md, CHANGELOG.md
tested-with: GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.5 || ==9.6.1
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
cabal-version: 1.18
Source-repository head
type: git
Expand All @@ -25,7 +25,7 @@ library
Diagrams.Backend.Rasterific.Text
hs-source-dirs: src
other-modules: Paths_diagrams_rasterific
build-depends: base >= 4.2 && < 4.19,
build-depends: base >= 4.2 && < 4.20,
diagrams-core >= 1.4 && < 1.6,
diagrams-lib >= 1.4 && < 1.5,
hashable >= 1.1 && < 1.5,
Expand All @@ -38,7 +38,7 @@ library
containers >= 0.5 && < 0.7,
filepath >= 1.2 && < 1.5,
optparse-applicative >= 0.13 && < 0.19,
bytestring >= 0.9 && < 0.12,
bytestring >= 0.9 && < 0.13,
file-embed >= 0.0 && < 0.1

default-language: Haskell2010
Expand All @@ -48,7 +48,7 @@ test-suite test-render
type: exitcode-stdio-1.0
main-is: test-render.hs
hs-source-dirs: test
build-depends: base >= 4.2 && < 4.19,
build-depends: base >= 4.2 && < 4.20,
diagrams-rasterific,
diagrams-core >= 1.4 && < 1.6,
diagrams-lib >= 1.4 && < 1.5
Expand All @@ -59,7 +59,7 @@ test-suite test-widths
type: exitcode-stdio-1.0
main-is: test-widths.hs
hs-source-dirs: test
build-depends: base >= 4.2 && < 4.19,
build-depends: base >= 4.2 && < 4.20,
diagrams-rasterific,
diagrams-core >= 1.4 && < 1.6,
diagrams-lib >= 1.4 && < 1.5
Expand All @@ -70,7 +70,7 @@ test-suite test-size
type: exitcode-stdio-1.0
main-is: test-size.hs
hs-source-dirs: test
build-depends: base >= 4.2 && < 4.19,
build-depends: base >= 4.2 && < 4.20,
diagrams-rasterific,
diagrams-core >= 1.4 && < 1.6,
diagrams-lib >= 1.4 && < 1.5
Expand Down

0 comments on commit 50ab26a

Please sign in to comment.