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

Remove custom setup to enable cross-compilation #107

Merged
merged 3 commits into from
Dec 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 11 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
# dependencies, so it is probably okay we aren't testing on OSX.
# - macOS-latest
cabal:
- "latest"
- "3.12.1.0"
ghc:
- "8.0.2"
- "8.2.2"
Expand All @@ -37,6 +37,10 @@ jobs:
- "8.10.7"
- "9.0.2"
- "9.2.4"
- "9.4.8"
- "9.6.6"
- "9.8.4"
- "9.10.1"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -73,9 +77,14 @@ jobs:
rm ./cabal.project
cabal build package:pretty-simple --enable-tests --enable-benchmarks --write-ghc-environment-files=always --flags="buildexample"

- name: Install doctest
run: |
cabal install --ignore-project doctest --flag cabal-doctest
echo "$HOME/.cabal/bin" >> $GITHUB_PATH

- name: Test
run: |
cabal test package:pretty-simple --enable-tests
cabal doctest

stack:
name: stack / ubuntu-latest
Expand Down Expand Up @@ -104,10 +113,6 @@ jobs:
run: |
stack build --test --bench --no-run-tests --no-run-benchmarks --flag pretty-simple:buildexample

- name: Test
run: |
stack test

nix-build-web:
name: Nix build GHCJS web
runs-on: ubuntu-latest
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,14 @@ Feel free to open an
[PR](https://github.com/cdepillabout/pretty-simple/pulls) for any
bugs/problems/suggestions/improvements.

### Testing

To run the test suite locally, one must install the executables `doctest` and
`cabal-doctest`, e.g. with
`cabal install --ignore-project doctest --flag cabal-doctest`.

Then run the command `cabal doctest`.

## Maintainers

- [@cdepillabout](https://github.com/cdepillabout)
Expand Down
33 changes: 0 additions & 33 deletions Setup.hs

This file was deleted.

19 changes: 1 addition & 18 deletions pretty-simple.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,12 @@ author: Dennis Gosnell
maintainer: [email protected]
copyright: 2017-2019 Dennis Gosnell
category: Text
build-type: Custom
build-type: Simple
extra-source-files: CHANGELOG.md
, README.md
, img/pretty-simple-example-screenshot.png
cabal-version: >=1.10

custom-setup
setup-depends: base
, Cabal >= 1.24
, cabal-doctest >=1.0.2

flag buildexe
description: Build an small command line program that pretty-print anything from stdin.
default: True
Expand Down Expand Up @@ -96,18 +91,6 @@ executable pretty-simple-json-example
else
buildable: False

test-suite pretty-simple-doctest
type: exitcode-stdio-1.0
main-is: DocTest.hs
hs-source-dirs: test
build-depends: base
, doctest >= 0.13
, Glob
, QuickCheck
, template-haskell
default-language: Haskell2010
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N

benchmark pretty-simple-bench
type: exitcode-stdio-1.0
main-is: Bench.hs
Expand Down
12 changes: 0 additions & 12 deletions test/DocTest.hs

This file was deleted.

Loading