allow base-4.16, hashable-1.4; test with GHC 9.2
This commit is contained in:
Brent Yorgey
parent
3aea9ac2fc
commit
f51f8821c5
2 changed files with 87 additions and 34 deletions
115
.github/workflows/haskell-ci.yml
vendored
115
.github/workflows/haskell-ci.yml
vendored
|
|
@ -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.11.20210222
|
# version: 0.13.20211114
|
||||||
#
|
#
|
||||||
# REGENDATA ("0.11.20210222",["github","svg-builder.cabal"])
|
# REGENDATA ("0.13.20211114",["github","svg-builder.cabal"])
|
||||||
#
|
#
|
||||||
name: Haskell-CI
|
name: Haskell-CI
|
||||||
on:
|
on:
|
||||||
|
|
@ -18,55 +18,103 @@ on:
|
||||||
- pull_request
|
- pull_request
|
||||||
jobs:
|
jobs:
|
||||||
linux:
|
linux:
|
||||||
name: Haskell-CI - Linux - GHC ${{ matrix.ghc }}
|
name: Haskell-CI - Linux - ${{ matrix.compiler }}
|
||||||
runs-on: ubuntu-18.04
|
runs-on: ubuntu-18.04
|
||||||
|
timeout-minutes:
|
||||||
|
60
|
||||||
container:
|
container:
|
||||||
image: buildpack-deps:bionic
|
image: buildpack-deps:bionic
|
||||||
continue-on-error: ${{ matrix.allow-failure }}
|
continue-on-error: ${{ matrix.allow-failure }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- ghc: 9.0.1
|
- compiler: ghc-9.2.1
|
||||||
|
compilerKind: ghc
|
||||||
|
compilerVersion: 9.2.1
|
||||||
|
setup-method: ghcup
|
||||||
allow-failure: false
|
allow-failure: false
|
||||||
- ghc: 8.10.4
|
- compiler: ghc-9.0.1
|
||||||
|
compilerKind: ghc
|
||||||
|
compilerVersion: 9.0.1
|
||||||
|
setup-method: hvr-ppa
|
||||||
allow-failure: false
|
allow-failure: false
|
||||||
- ghc: 8.8.4
|
- compiler: ghc-8.10.4
|
||||||
|
compilerKind: ghc
|
||||||
|
compilerVersion: 8.10.4
|
||||||
|
setup-method: hvr-ppa
|
||||||
allow-failure: false
|
allow-failure: false
|
||||||
- ghc: 8.6.5
|
- compiler: ghc-8.8.4
|
||||||
|
compilerKind: ghc
|
||||||
|
compilerVersion: 8.8.4
|
||||||
|
setup-method: hvr-ppa
|
||||||
allow-failure: false
|
allow-failure: false
|
||||||
- ghc: 8.4.4
|
- compiler: ghc-8.6.5
|
||||||
|
compilerKind: ghc
|
||||||
|
compilerVersion: 8.6.5
|
||||||
|
setup-method: hvr-ppa
|
||||||
|
allow-failure: false
|
||||||
|
- compiler: ghc-8.4.4
|
||||||
|
compilerKind: ghc
|
||||||
|
compilerVersion: 8.4.4
|
||||||
|
setup-method: hvr-ppa
|
||||||
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
|
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
|
||||||
apt-add-repository -y 'ppa:hvr/ghc'
|
if [ "${{ matrix.setup-method }}" = ghcup ]; then
|
||||||
apt-get update
|
mkdir -p "$HOME/.ghcup/bin"
|
||||||
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
|
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
|
||||||
|
chmod a+x "$HOME/.ghcup/bin/ghcup"
|
||||||
|
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
|
||||||
|
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
|
||||||
|
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.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
|
||||||
|
chmod a+x "$HOME/.ghcup/bin/ghcup"
|
||||||
|
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
|
||||||
|
fi
|
||||||
env:
|
env:
|
||||||
GHC_VERSION: ${{ matrix.ghc }}
|
HCKIND: ${{ matrix.compilerKind }}
|
||||||
|
HCNAME: ${{ matrix.compiler }}
|
||||||
|
HCVER: ${{ matrix.compilerVersion }}
|
||||||
- name: Set PATH and environment variables
|
- name: Set PATH and environment variables
|
||||||
run: |
|
run: |
|
||||||
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
|
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
|
||||||
echo "LANG=C.UTF-8" >> $GITHUB_ENV
|
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
|
||||||
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"
|
||||||
HC=/opt/ghc/$GHC_VERSION/bin/ghc
|
HCDIR=/opt/$HCKIND/$HCVER
|
||||||
echo "HC=$HC" >> $GITHUB_ENV
|
if [ "${{ matrix.setup-method }}" = ghcup ]; then
|
||||||
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
|
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
|
||||||
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
|
echo "HC=$HC" >> "$GITHUB_ENV"
|
||||||
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $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.6.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.6.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"
|
||||||
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
|
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
|
||||||
echo "HEADHACKAGE=false" >> $GITHUB_ENV
|
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
|
||||||
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
|
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
|
||||||
echo "GHCJSARITH=0" >> $GITHUB_ENV
|
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
|
||||||
env:
|
env:
|
||||||
GHC_VERSION: ${{ matrix.ghc }}
|
HCKIND: ${{ matrix.compilerKind }}
|
||||||
|
HCNAME: ${{ matrix.compiler }}
|
||||||
|
HCVER: ${{ matrix.compilerVersion }}
|
||||||
- name: env
|
- name: env
|
||||||
run: |
|
run: |
|
||||||
env
|
env
|
||||||
|
|
@ -89,6 +137,10 @@ jobs:
|
||||||
repository hackage.haskell.org
|
repository hackage.haskell.org
|
||||||
url: http://hackage.haskell.org/
|
url: http://hackage.haskell.org/
|
||||||
EOF
|
EOF
|
||||||
|
cat >> $CABAL_CONFIG <<EOF
|
||||||
|
program-default-options
|
||||||
|
ghc-options: $GHCJOBS +RTS -M3G -RTS
|
||||||
|
EOF
|
||||||
cat $CABAL_CONFIG
|
cat $CABAL_CONFIG
|
||||||
- name: versions
|
- name: versions
|
||||||
run: |
|
run: |
|
||||||
|
|
@ -127,7 +179,8 @@ jobs:
|
||||||
- name: generate cabal.project
|
- name: generate cabal.project
|
||||||
run: |
|
run: |
|
||||||
PKGDIR_svg_builder="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/svg-builder-[0-9.]*')"
|
PKGDIR_svg_builder="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/svg-builder-[0-9.]*')"
|
||||||
echo "PKGDIR_svg_builder=${PKGDIR_svg_builder}" >> $GITHUB_ENV
|
echo "PKGDIR_svg_builder=${PKGDIR_svg_builder}" >> "$GITHUB_ENV"
|
||||||
|
rm -f cabal.project cabal.project.local
|
||||||
touch cabal.project
|
touch cabal.project
|
||||||
touch cabal.project.local
|
touch cabal.project.local
|
||||||
echo "packages: ${PKGDIR_svg_builder}" >> cabal.project
|
echo "packages: ${PKGDIR_svg_builder}" >> cabal.project
|
||||||
|
|
@ -145,9 +198,9 @@ jobs:
|
||||||
- name: cache
|
- name: cache
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
|
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
|
||||||
path: ~/.cabal/store
|
path: ~/.cabal/store
|
||||||
restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
|
restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
|
||||||
- name: install dependencies
|
- name: install dependencies
|
||||||
run: |
|
run: |
|
||||||
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
|
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
|
||||||
|
|
|
||||||
|
|
@ -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
|
tested-with: GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1 || ==9.2.1
|
||||||
|
|
||||||
source-repository head
|
source-repository head
|
||||||
type: git
|
type: git
|
||||||
|
|
@ -25,10 +25,10 @@ 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.16,
|
build-depends: base >= 4.5 && < 4.17,
|
||||||
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.4,
|
hashable >= 1.1 && < 1.5,
|
||||||
text >= 0.11 && < 1.3,
|
text >= 0.11 && < 1.3,
|
||||||
unordered-containers >= 0.2 && < 0.3
|
unordered-containers >= 0.2 && < 0.3
|
||||||
if !impl(ghc >= 8.0)
|
if !impl(ghc >= 8.0)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue