rhi/svg-builder
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

allow base-4.17 and test with GHC 9.4

Browse source
This commit is contained in:
Brent Yorgey 2022-09-01 13:29:55 -05:00
parent 38d7c7651b
commit 4349884e62
2 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
.github/workflows/haskell-ci.yml vendored
View file

@ -8,9 +8,9 @@
# #
# For more information, see https://github.com/haskell-CI/haskell-ci # For more information, see https://github.com/haskell-CI/haskell-ci
# #
# version: 0.13.20211114 # version: 0.15.20220808
# #
# REGENDATA ("0.13.20211114",["github","svg-builder.cabal"]) # REGENDATA ("0.15.20220808",["github","svg-builder.cabal"])
# #
name: Haskell-CI name: Haskell-CI
on: on:
@ -19,7 +19,7 @@ on:
jobs: jobs:
linux: linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }} name: Haskell-CI - Linux - ${{ matrix.compiler }}
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
timeout-minutes: timeout-minutes:
60 60
container: container:
@ -28,20 +28,25 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- compiler: ghc-9.2.1 - compiler: ghc-9.4.1
compilerKind: ghc compilerKind: ghc
compilerVersion: 9.2.1 compilerVersion: 9.4.1
setup-method: ghcup setup-method: ghcup
allow-failure: false allow-failure: false
- compiler: ghc-9.0.1 - compiler: ghc-9.2.4
compilerKind: ghc compilerKind: ghc
compilerVersion: 9.0.1 compilerVersion: 9.2.4
setup-method: hvr-ppa setup-method: ghcup
allow-failure: false allow-failure: false
- compiler: ghc-8.10.4 - compiler: ghc-9.0.2
compilerKind: ghc compilerKind: ghc
compilerVersion: 8.10.4 compilerVersion: 9.0.2
setup-method: hvr-ppa setup-method: ghcup
allow-failure: false
- compiler: ghc-8.10.7
compilerKind: ghc
compilerVersion: 8.10.7
setup-method: ghcup
allow-failure: false allow-failure: false
- compiler: ghc-8.8.4 - compiler: ghc-8.8.4
compilerKind: ghc compilerKind: ghc
@ -66,18 +71,18 @@ jobs:
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
if [ "${{ matrix.setup-method }}" = ghcup ]; then if [ "${{ matrix.setup-method }}" = ghcup ]; then
mkdir -p "$HOME/.ghcup/bin" mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup" curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
else else
apt-add-repository -y 'ppa:hvr/ghc' apt-add-repository -y 'ppa:hvr/ghc'
apt-get update apt-get update
apt-get install -y "$HCNAME" apt-get install -y "$HCNAME"
mkdir -p "$HOME/.ghcup/bin" mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup" curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
fi fi
env: env:
HCKIND: ${{ matrix.compilerKind }} HCKIND: ${{ matrix.compilerKind }}
@ -217,7 +222,7 @@ jobs:
${CABAL} -vnormal check ${CABAL} -vnormal check
- name: haddock - name: haddock
run: | run: |
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
- name: unconstrained build - name: unconstrained build
run: | run: |
rm -f cabal.project.local rm -f cabal.project.local

4
svg-builder.cabal
View file

@ -12,7 +12,7 @@ category: Graphics
build-type: Simple build-type: Simple
extra-source-files: README.md extra-source-files: README.md
cabal-version: >=1.10 cabal-version: >=1.10
tested-with: GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1 || ==9.2.1 tested-with: GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.1
source-repository head source-repository head
type: git type: git
@ -25,7 +25,7 @@ library
Graphics.Svg.Path, Graphics.Svg.Path,
Graphics.Svg.Elements, Graphics.Svg.Elements,
Graphics.Svg.Attributes Graphics.Svg.Attributes
build-depends: base >= 4.5 && < 4.17, build-depends: base >= 4.5 && < 4.18,
blaze-builder >= 0.4 && < 0.5, blaze-builder >= 0.4 && < 0.5,
bytestring >= 0.10 && < 0.12, bytestring >= 0.10 && < 0.12,
hashable >= 1.1 && < 1.5, hashable >= 1.1 && < 1.5,