Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use 'prettyprinter' library #67

Merged
merged 31 commits into from
Aug 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
20d8a2d
Use 'prettyprinter' library for printing
georgefst Jun 9, 2020
4625f30
Fix multi-line 'other's
georgefst Jun 9, 2020
da4ff87
Simplify and document annotation processing
georgefst Jun 25, 2020
4b981a5
Remove unused TemplateHaskell pragma
georgefst Jun 25, 2020
48a2359
More compactness - fixes 3 of the tests
georgefst Jun 25, 2020
19b1c18
Simplify further
georgefst Jun 26, 2020
07f82ca
Clean up and document
georgefst Jun 26, 2020
11f99b2
Import Data.Monoid on older GHCs
georgefst Jun 26, 2020
3b44727
Fix CPP syntax
georgefst Jun 26, 2020
3d2460e
Haddock-ify a comment
georgefst Jun 27, 2020
c1b084d
Fix remaining tests
georgefst Jun 27, 2020
677eb44
Use colour in executable and example
georgefst Jun 29, 2020
4840dad
Use 'dropWhileEnd' instead of reversing list twice
georgefst Jun 29, 2020
f6ae384
Remove ViewPatterns
georgefst Jun 29, 2020
3472c6d
Remove redundant $
georgefst Jun 29, 2020
e06aeeb
Use smarter layout algorithm
georgefst Jun 29, 2020
0d4f41e
Include escape codes in output of 'pString' etc.
georgefst Jun 29, 2020
aa13ebc
Add missing case in 'isSimple'
georgefst Jun 30, 2020
95a86f6
Make 'pString' lazy again
georgefst Jun 30, 2020
c1cc680
[skip ci] Fix typo
georgefst Jun 30, 2020
f5700ca
Bump prettyprinter-ansi-terminal version
georgefst Jul 31, 2020
0de7092
Remove ansi-terminal dependency
georgefst Jul 31, 2020
846b488
Use the new prettyprinter module names
georgefst Jul 31, 2020
88f6a16
[skip ci] Alphabetise extensions
georgefst Jul 31, 2020
2cc2093
Add stack extra-deps
georgefst Jul 31, 2020
21f9804
Add note about stack extra-deps.
cdepillabout Aug 11, 2020
56ad278
Update stack.yaml.lock.
cdepillabout Aug 11, 2020
5d78be9
Add CI workflows.
cdepillabout Aug 11, 2020
aea27b3
Make sure to compile with the correct flag.
cdepillabout Aug 11, 2020
c91b35e
Update the build status shield on the README.
cdepillabout Aug 11, 2020
9566022
Remove .travis.yml.
cdepillabout Aug 11, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 77 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: CI

# Trigger the workflow on push or pull request, but only for the master branch
on:
pull_request:
push:
branches: [master]

jobs:
cabal:
name: ${{ matrix.os }} / ghc ${{ matrix.ghc }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macOS-latest]
cabal: ["latest"]
ghc:
- "8.6.5"
- "8.8.3"
- "8.10.1"

steps:
- uses: actions/checkout@v2
#if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'

- uses: actions/[email protected]
id: setup-haskell-cabal
name: Setup Haskell
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}

- uses: actions/cache@v1
name: Cache cabal-store
with:
path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
key: ${{ runner.os }}-${{ matrix.ghc }}-cabal

- name: Build
run: |
cabal update
cabal build all --enable-tests --enable-benchmarks --write-ghc-environment-files=always

- name: Test
run: |
cabal test all --enable-tests

stack:
name: stack / ghc ${{ matrix.ghc }}
runs-on: ubuntu-latest
strategy:
matrix:
stack: ["latest"]

steps:
- uses: actions/checkout@v2
#if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'

- uses: actions/[email protected]
name: Setup Haskell Stack
with:
stack-version: ${{ matrix.stack }}

- uses: actions/cache@v1
name: Cache ~/.stack
with:
path: ~/.stack
key: ${{ runner.os }}-${{ matrix.ghc }}-stack

- name: Build
run: |
stack build --test --bench --no-run-tests --no-run-benchmarks --flag pretty-simple:buildexe --flag pretty-simple:buildexample

- name: Test
run: |
stack test

260 changes: 0 additions & 260 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Text.Pretty.Simple
==================

[![Build Status](https://secure.travis-ci.org/cdepillabout/pretty-simple.svg)](http://travis-ci.org/cdepillabout/pretty-simple)
[![Build Status](https://github.com/cdepillabout/pretty-simple/workflows/CI/badge.svg)](https://github.com/cdepillabout/pretty-simple/actions)
[![Hackage](https://img.shields.io/hackage/v/pretty-simple.svg)](https://hackage.haskell.org/package/pretty-simple)
[![Stackage LTS](http://stackage.org/package/pretty-simple/badge/lts)](http://stackage.org/lts/package/pretty-simple)
[![Stackage Nightly](http://stackage.org/package/pretty-simple/badge/nightly)](http://stackage.org/nightly/package/pretty-simple)
Expand Down
5 changes: 2 additions & 3 deletions pretty-simple.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,12 @@ library
, Text.Pretty.Simple.Internal.Color
, Text.Pretty.Simple.Internal.Expr
, Text.Pretty.Simple.Internal.ExprParser
, Text.Pretty.Simple.Internal.ExprToOutput
, Text.Pretty.Simple.Internal.Output
, Text.Pretty.Simple.Internal.OutputPrinter
build-depends: base >= 4.8 && < 5
, ansi-terminal >= 0.6
, containers
, mtl >= 2.2
, prettyprinter >= 1.7.0
, prettyprinter-ansi-terminal >= 1.1.2
, text >= 1.2
, transformers >= 0.4
default-language: Haskell2010
Expand Down
Loading