mirror of
https://github.com/ilyakooo0/reflex-vty.git
synced 2024-11-22 02:33:55 +03:00
Backport GHC 8.10 support for last release
This commit is contained in:
John Ericson
parent
551c109323
commit
ddac93d270
24
.github/workflows/haskell.yml
vendored
24
.github/workflows/haskell.yml
vendored
@ -1,33 +1,33 @@
|
||||
name: Haskell CI
|
||||
name: github-action
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
matrix:
|
||||
ghc: ['8.4.4', '8.6.5', '8.8.4']
|
||||
os: ['ubuntu-latest']
|
||||
ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.2']
|
||||
os: ['ubuntu-latest', 'macos-latest']
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-haskell@v1
|
||||
with:
|
||||
ghc-version: ${{ matrix.ghc }}
|
||||
cabal-version: '3.0'
|
||||
|
||||
- name: Cache
|
||||
uses: actions/cache@v1
|
||||
env:
|
||||
cache-name: cache-cabal
|
||||
with:
|
||||
path: ~/.cabal
|
||||
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
|
||||
key: ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-build-${{ env.cache-name }}-
|
||||
${{ runner.os }}-build-
|
||||
${{ runner.os }}-
|
||||
${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-
|
||||
${{ runner.os }}-${{ matrix.ghc }}-build-
|
||||
${{ runner.os }}-${{ matrix.ghc }}-
|
||||
${{ runner.os }}
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
@ -37,3 +37,5 @@ jobs:
|
||||
run: cabal build --enable-tests --enable-benchmarks all
|
||||
- name: Run tests
|
||||
run: cabal test all
|
||||
- name: Build Docs
|
||||
run: cabal haddock
|
||||
|
||||
112
.travis.yml
112
.travis.yml
@ -1,112 +0,0 @@
|
||||
# This Travis job script has been generated by a script via
|
||||
#
|
||||
# haskell-ci 'reflex-vty.cabal' '--output' '.travis.yml'
|
||||
#
|
||||
# For more information, see https://github.com/haskell-CI/haskell-ci
|
||||
#
|
||||
# version: 0.3
|
||||
#
|
||||
language: c
|
||||
dist: xenial
|
||||
|
||||
git:
|
||||
submodules: false # whether to recursively clone submodules
|
||||
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.cabal/packages
|
||||
- $HOME/.cabal/store
|
||||
|
||||
before_cache:
|
||||
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
|
||||
# remove files that are regenerated by 'cabal update'
|
||||
- rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
|
||||
- rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
|
||||
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
|
||||
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
|
||||
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
|
||||
|
||||
- rm -rfv $CABALHOME/packages/head.hackage
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- compiler: "ghc-8.8.3"
|
||||
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-3.0,ghc-8.8.3], sources: [hvr-ghc]}}
|
||||
- compiler: "ghc-8.6.5"
|
||||
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
|
||||
- compiler: "ghc-8.4.4"
|
||||
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
|
||||
|
||||
|
||||
before_install:
|
||||
- HC=/opt/ghc/bin/${CC}
|
||||
- HCPKG=${HC/ghc/ghc-pkg}
|
||||
- unset CC
|
||||
- CABAL=/opt/ghc/bin/cabal
|
||||
- CABALHOME=$HOME/.cabal
|
||||
- export PATH="$CABALHOME/bin:$PATH"
|
||||
- ROOTDIR=$(pwd)
|
||||
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
|
||||
- echo $HCNUMVER
|
||||
|
||||
install:
|
||||
- ${CABAL} --version
|
||||
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
|
||||
- TEST=--enable-tests
|
||||
- BENCH=--enable-benchmarks
|
||||
- GHCHEAD=${GHCHEAD-false}
|
||||
- travis_retry ${CABAL} update -v
|
||||
- sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config
|
||||
- rm -fv cabal.project cabal.project.local
|
||||
- grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$'
|
||||
- rm -f cabal.project
|
||||
- touch cabal.project
|
||||
- "printf 'packages: \".\"\\n' >> cabal.project"
|
||||
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
|
||||
- touch cabal.project.local
|
||||
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(reflex-vty)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
|
||||
- cat cabal.project || true
|
||||
- cat cabal.project.local || true
|
||||
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
|
||||
- rm -f cabal.project.freeze
|
||||
- ${CABAL} new-freeze -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dry
|
||||
- "cat \"cabal.project.freeze\" | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
|
||||
- rm "cabal.project.freeze"
|
||||
- ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
|
||||
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
|
||||
- rm -rf .ghc.environment.* "."/dist
|
||||
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
|
||||
|
||||
# Here starts the actual work to be performed for the package under test;
|
||||
# any command which exits with a non-zero exit code causes the build to fail.
|
||||
script:
|
||||
# test that source-distributions can be generated
|
||||
- ${CABAL} new-sdist all
|
||||
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
|
||||
- cd ${DISTDIR} || false
|
||||
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
|
||||
- rm -f cabal.project
|
||||
- touch cabal.project
|
||||
- "printf 'packages: \"reflex-vty-*/*.cabal\"\\n' >> cabal.project"
|
||||
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
|
||||
- touch cabal.project.local
|
||||
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(reflex-vty)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
|
||||
- cat cabal.project || true
|
||||
- cat cabal.project.local || true
|
||||
# this builds all libraries and executables (without tests/benchmarks)
|
||||
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all
|
||||
|
||||
# build & run tests, build benchmarks
|
||||
- ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all
|
||||
|
||||
# cabal check
|
||||
- (cd reflex-vty-* && ${CABAL} check)
|
||||
|
||||
# haddock
|
||||
- ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all
|
||||
|
||||
# Build without installed constraints for packages in global-db
|
||||
- rm -f cabal.project.local; ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all
|
||||
|
||||
# REGENDATA ["reflex-vty.cabal","--output",".travis.yml"]
|
||||
# EOF
|
||||
@ -1,5 +1,9 @@
|
||||
# Revision history for reflex-vty
|
||||
|
||||
## 0.1.4.2
|
||||
|
||||
* Wider bounds for GHC 8.10 support
|
||||
|
||||
## 0.1.4.1
|
||||
|
||||
* Migrate to new dependent-sum / dependent-map (after the "some" package split)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"owner": "reflex-frp",
|
||||
"repo": "reflex-platform",
|
||||
"branch": "aa-bump-some",
|
||||
"branch": "develop",
|
||||
"private": false,
|
||||
"rev": "717b2afbb7530288f8e2d1699cb1033d6f217774",
|
||||
"sha256": "1n864wgyg8373q6prkqlck4prhjs1djx7l9a8g141caygsaclyjy"
|
||||
"rev": "f019863c21ee85498e6a6e0072e617b2462b70ed",
|
||||
"sha256": "146xfjqdwd55s9jg1ggi6akcxxxd5c0pvc4bpjx3whwiikpcv8y4"
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name: reflex-vty
|
||||
version: 0.1.4.1
|
||||
version: 0.1.4.2
|
||||
synopsis: Reflex FRP host and widgets for VTY applications
|
||||
description:
|
||||
Build terminal applications using functional reactive programming (FRP) with Reflex FRP (<https://reflex-frp.org>).
|
||||
@ -17,7 +17,12 @@ extra-source-files:
|
||||
README.md
|
||||
ChangeLog.md
|
||||
extra-doc-files: doc/tasks.png
|
||||
tested-with: GHC ==8.8.4 || ==8.6.5 || ==8.4.4
|
||||
tested-with:
|
||||
GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2
|
||||
|
||||
source-repository head
|
||||
type: git
|
||||
location: https://github.com/reflex-frp/reflex-vty
|
||||
|
||||
library
|
||||
exposed-modules: Reflex.Vty
|
||||
@ -31,8 +36,8 @@ library
|
||||
, Reflex.Spider.Orphans
|
||||
, Control.Monad.NodeId
|
||||
build-depends:
|
||||
base >= 4.10.0 && < 4.14,
|
||||
bimap >= 0.3.3 && < 0.4,
|
||||
base >= 4.10.0 && < 4.15,
|
||||
bimap >= 0.3.3 && < 0.5,
|
||||
containers >= 0.5.0 && < 0.7,
|
||||
mtl >= 2.2.2 && < 2.3,
|
||||
transformers >= 0.5.5 && < 0.6,
|
||||
@ -45,7 +50,7 @@ library
|
||||
exception-transformers >= 0.4.0 && < 0.5,
|
||||
primitive >= 0.6.3 && < 0.8,
|
||||
ref-tf >= 0.4.0 && < 0.5,
|
||||
reflex >= 0.7.2 && < 0.8,
|
||||
reflex >= 0.8 && < 0.9,
|
||||
time >= 1.8.0 && < 1.10,
|
||||
vty >= 5.21 && < 5.29
|
||||
hs-source-dirs: src
|
||||
@ -66,7 +71,3 @@ executable example
|
||||
transformers,
|
||||
vty
|
||||
default-language: Haskell2010
|
||||
|
||||
source-repository head
|
||||
type: git
|
||||
location: https://github.com/reflex-frp/reflex-vty
|
||||
|
||||
Loading…
Reference in New Issue
Block a user