Skip to content

Commit

Permalink
Support latest GHCs, update maintenance info (#6)
Browse files Browse the repository at this point in the history
* Support latest GHCs, update maintenance info

* Update .cabal version
  • Loading branch information
chshersh authored and vrom911 committed Dec 26, 2019
1 parent 8acfb22 commit ceed18f
Show file tree
Hide file tree
Showing 13 changed files with 713 additions and 245 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @chshersh @vrom911
42 changes: 39 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
### Haskell
dist
dist-*
cabal-dev
*.o
*.hi
Expand All @@ -9,14 +11,48 @@ cabal-dev
*.prof
*.aux
*.hp
*.eventlog
.virtualenv
.hsenv
.hpc
.stack-work/
.cabal-sandbox/
cabal.sandbox.config
cabal.config
TAGS
.DS_Store
cabal.project.local
.HTF/
.ghc.environment*

# Stack
.stack-work/
stack.yaml.lock

# Nix
result

### IDE/support
# Vim
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-v][a-z]
[._]sw[a-p]
*~
tags

# IntellijIDEA
.idea/
.ideaHaskellLib/
*.iml

# Atom
.haskell-ghc-mod.json

# VS
.vscode/

# Emacs
*#
.dir-locals.el
TAGS

# other
.DS_Store
61 changes: 61 additions & 0 deletions .stylish-haskell.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
steps:
- simple_align:
cases: true
top_level_patterns: true
records: true

# Import cleanup
- imports:
align: none
list_align: after_alias
pad_module_names: false
long_list_align: inline
empty_list_align: inherit
list_padding: 4
separate_lists: true
space_surround: false

- language_pragmas:
style: vertical
remove_redundant: true

# Remove trailing whitespace
- trailing_whitespace: {}

columns: 100

newline: native

language_extensions:
- BangPatterns
- ConstraintKinds
- DataKinds
- DefaultSignatures
- DeriveAnyClass
- DeriveDataTypeable
- DeriveGeneric
- DerivingStrategies
- DerivingVia
- ExplicitNamespaces
- FlexibleContexts
- FlexibleInstances
- FunctionalDependencies
- GADTs
- GeneralizedNewtypeDeriving
- InstanceSigs
- KindSignatures
- LambdaCase
- MultiParamTypeClasses
- MultiWayIf
- NamedFieldPuns
- NoImplicitPrelude
- OverloadedStrings
- QuasiQuotes
- RecordWildCards
- ScopedTypeVariables
- StandaloneDeriving
- TemplateHaskell
- TupleSections
- TypeApplications
- TypeFamilies
- ViewPatterns
127 changes: 41 additions & 86 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,97 +1,52 @@
# This file has been generated -- see https://github.com/hvr/multi-ghc-travis
language: c
sudo: false
sudo: true
language: haskell

git:
depth: 5

cabal: "3.0"

cache:
directories:
- $HOME/.cabsnap
- $HOME/.cabal/packages

before_cache:
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar
- "$HOME/.cabal/store"
- "$HOME/.stack"
- "$TRAVIS_BUILD_DIR/.stack-work"

matrix:
include:
- env: CABALVER=1.16 GHCVER=7.4.2
compiler: ": #GHC 7.4.2"
addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}}
- env: CABALVER=1.16 GHCVER=7.6.3
compiler: ": #GHC 7.6.3"
addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
- env: CABALVER=1.18 GHCVER=7.8.4
compiler: ": #GHC 7.8.4"
addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
- env: CABALVER=1.22 GHCVER=7.10.3
compiler: ": #GHC 7.10.3"
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
- env: CABALVER=1.24 GHCVER=8.0.1
compiler: ": #GHC 8.0.1"
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
# Cabal
- ghc: 8.2.2
- ghc: 8.4.4
- ghc: 8.6.5
- ghc: 8.8.1

before_install:
- unset CC
- export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
# stack
- ghc: 8.8.1
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"

install:
- cabal --version
- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
- if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
then
zcat $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz >
$HOME/.cabal/packages/hackage.haskell.org/00-index.tar;
fi
- travis_retry cabal update -v
- sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
- if [ $GHCVER != 7.4.2 ] && [ $GHCVER != 7.6.3 ];
then cabal install --only-dependencies --enable-tests --enable-benchmarks --dry -v > installplan.txt;
else cabal install --only-dependencies --enable-tests --dry -v > installplan.txt;
fi
- sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt

# check whether current requested install-plan matches cached package-db snapshot
- if diff -u installplan.txt $HOME/.cabsnap/installplan.txt;
then
echo "cabal build-cache HIT";
rm -rfv .ghc;
cp -a $HOME/.cabsnap/ghc $HOME/.ghc;
cp -a $HOME/.cabsnap/lib $HOME/.cabsnap/share $HOME/.cabsnap/bin $HOME/.cabal/;
else
echo "cabal build-cache MISS";
rm -rf $HOME/.cabsnap;
mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
if [ $GHCVER != 7.4.2 ] && [ $GHCVER != 7.6.3 ];
then cabal install --only-dependencies --enable-tests --enable-benchmarks;
else cabal install --only-dependencies --enable-tests;
fi
fi
- |
if [ -z "$STACK_YAML" ]; then
ghc --version
cabal --version
cabal update
cabal build --enable-tests --enable-benchmarks
else
# install stack
curl -sSL https://get.haskellstack.org/ | sh
# build project with stack
stack --version
stack build --system-ghc --test --no-run-tests --bench --no-run-benchmarks
fi
# snapshot package-db on cache miss
- if [ ! -d $HOME/.cabsnap ];
then
echo "snapshotting package-db to build-cache";
mkdir $HOME/.cabsnap;
cp -a $HOME/.ghc $HOME/.cabsnap/ghc;
cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
fi

# 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:
- if [ -f configure.ac ]; then autoreconf -i; fi
# building benchmarks fails on earlier GHCs for some reason
- if [ $GHCVER != 7.4.2 ] && [ $GHCVER != 7.6.3 ];
then cabal configure --enable-tests --enable-benchmarks;
else cabal configure --enable-tests;
fi
- cabal build --ghc-options=-Werror
- cabal test
- cabal sdist # tests that a source-distribution can be generated

# Check that the resulting source distribution can be built & installed.
# If there are no other `.tar.gz` files in `dist`, this can be even simpler:
# `cabal install --force-reinstalls dist/*-*.tar.gz`
- SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
(cd dist && cabal install --force-reinstalls "$SRC_TGZ")

# EOF
- |
if [ -z "$STACK_YAML" ]; then
cabal test --enable-tests
else
stack test --no-terminal --system-ghc
fi
notifications:
email: false
21 changes: 17 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
# 0.3.1.0
# Changelog

`ilist` uses [PVP Versioning][1].
The changelog is available [on GitHub][2].

## 0.4.0.0 — Dec 26, 2019

* Support GHC-8.8, GHC-8.6, GHC-8.4, GHC-8.2. Drop older GHC versions support.
* Update maintenance info.

## 0.3.1.0

* Added `ireplicateM` and `ireplicateM_`.

# 0.3.0.0
## 0.3.0.0

* `ifind` now returns the index alongside with the value (same as in `lens`).

# 0.2.0.0
## 0.2.0.0

* `izipWithM` and `izipWithM_` have been generalised from `Monad` to `Applicative` (which mimics what was done in base-4.9).

# 0.1.0.0
## 0.1.0.0

First release.

[1]: https://pvp.haskell.org
[2]: https://github.com/kowainik/ilist/releases
Loading

0 comments on commit ceed18f

Please sign in to comment.