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

allow base-4.20 and test on GHC 9.10

Browse source
This commit is contained in:
Brent Yorgey 2024-06-21 11:06:37 -05:00
parent 4d26f9119d
commit b2c79c9a31
2 changed files with 34 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
.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.17.20231203 # version: 0.19.20240608
# #
# REGENDATA ("0.17.20231203",["github","svg-builder.cabal"]) # REGENDATA ("0.19.20240608",["github","svg-builder.cabal"])
# #
name: Haskell-CI name: Haskell-CI
on: on:
@ -23,19 +23,24 @@ jobs:
timeout-minutes: timeout-minutes:
60 60
container: container:
image: buildpack-deps:bionic image: buildpack-deps:jammy
continue-on-error: ${{ matrix.allow-failure }} continue-on-error: ${{ matrix.allow-failure }}
strategy: strategy:
matrix: matrix:
include: include:
- compiler: ghc-9.8.1 - compiler: ghc-9.10.1
compilerKind: ghc compilerKind: ghc
compilerVersion: 9.8.1 compilerVersion: 9.10.1
setup-method: ghcup setup-method: ghcup
allow-failure: false allow-failure: false
- compiler: ghc-9.6.3 - compiler: ghc-9.8.2
compilerKind: ghc compilerKind: ghc
compilerVersion: 9.6.3 compilerVersion: 9.8.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.6.5
compilerKind: ghc
compilerVersion: 9.6.5
setup-method: ghcup setup-method: ghcup
allow-failure: false allow-failure: false
- compiler: ghc-9.4.8 - compiler: ghc-9.4.8
@ -61,39 +66,29 @@ jobs:
- compiler: ghc-8.8.4 - compiler: ghc-8.8.4
compilerKind: ghc compilerKind: ghc
compilerVersion: 8.8.4 compilerVersion: 8.8.4
setup-method: hvr-ppa setup-method: ghcup
allow-failure: false allow-failure: false
- compiler: ghc-8.6.5 - compiler: ghc-8.6.5
compilerKind: ghc compilerKind: ghc
compilerVersion: 8.6.5 compilerVersion: 8.6.5
setup-method: hvr-ppa setup-method: ghcup
allow-failure: false allow-failure: false
- compiler: ghc-8.4.4 - compiler: ghc-8.4.4
compilerKind: ghc compilerKind: ghc
compilerVersion: 8.4.4 compilerVersion: 8.4.4
setup-method: hvr-ppa setup-method: ghcup
allow-failure: false allow-failure: false
fail-fast: false fail-fast: false
steps: steps:
- name: apt - name: apt
run: | run: |
apt-get update apt-get update
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 libnuma-dev
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.20.0/x86_64-linux-ghcup-0.1.20.0 > "$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"
chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$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.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.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.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
fi
env: env:
HCKIND: ${{ matrix.compilerKind }} HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }} HCNAME: ${{ matrix.compiler }}
@ -105,22 +100,13 @@ jobs:
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
HCDIR=/opt/$HCKIND/$HCVER HCDIR=/opt/$HCKIND/$HCVER
if [ "${{ matrix.setup-method }}" = ghcup ]; then HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') echo "HC=$HC" >> "$GITHUB_ENV"
echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HADDOCK=$HADDOCK" >> "$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.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.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))') 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 "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@ -177,7 +163,7 @@ jobs:
chmod a+x $HOME/.cabal/bin/cabal-plan chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version cabal-plan --version
- name: checkout - name: checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
path: source path: source
- name: initial cabal.project for sdist - name: initial cabal.project for sdist
@ -205,7 +191,7 @@ jobs:
echo " ghc-options: -Werror=missing-methods" >> cabal.project echo " ghc-options: -Werror=missing-methods" >> cabal.project
cat >> cabal.project <<EOF cat >> cabal.project <<EOF
EOF EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(svg-builder)$/; }' >> cabal.project.local $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(svg-builder)$/; }' >> cabal.project.local
cat cabal.project cat cabal.project
cat cabal.project.local cat cabal.project.local
- name: dump install plan - name: dump install plan
@ -213,7 +199,7 @@ jobs:
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
cabal-plan cabal-plan
- name: restore cache - name: restore cache
uses: actions/cache/restore@v3 uses: actions/cache/restore@v4
with: with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store path: ~/.cabal/store
@ -240,7 +226,7 @@ jobs:
rm -f cabal.project.local rm -f cabal.project.local
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
- name: save cache - name: save cache
uses: actions/cache/save@v3 uses: actions/cache/save@v4
if: always() if: always()
with: with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

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.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.3 || ==9.8.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.5 || ==9.8.2 || ==9.10.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.20, build-depends: base >= 4.5 && < 4.21,
blaze-builder >= 0.4 && < 0.5, blaze-builder >= 0.4 && < 0.5,
bytestring >= 0.10 && < 0.13, bytestring >= 0.10 && < 0.13,
hashable >= 1.1 && < 1.5, hashable >= 1.1 && < 1.5,