Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit 7ccb508

Browse files
committed
Use pedantic.sh in Makefile
1 parent 60234a3 commit 7ccb508

File tree

4 files changed

+12
-22
lines changed

4 files changed

+12
-22
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ install:
2222
- "./travis_long stack +RTS -N2 -RTS setup"
2323
- "./travis_long stack build --only-snapshot"
2424
script:
25-
- "./travis_long ./pedantic.sh"
25+
- "./travis_long ./pedantic.sh +RTS -N1 -RTS"
2626
- "./travis_long stack exec emacs24 -- -q --batch -L elisp -l elisp/tests/hie-tests.el
2727
-f ert-run-tests-batch-and-exit"
2828
- "./travis_long ./deploy-docs.sh"

Makefile

+1-10
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,7 @@ test-haskell:
1616
# stack build --test --pedantic
1717
# stack complains about deprecations in ghc-mod as an extra dep
1818
# build with -Werror enabled but run the tests without it because ide-backend picks it up
19-
stack build --test --flag haskell-ide-engine:pedantic \
20-
--flag hie-apply-refact:pedantic \
21-
--flag hie-base:pedantic \
22-
--flag hie-docs-generator:pedantic \
23-
--flag hie-eg-plugin-async:pedantic \
24-
--flag hie-example-plugin2:pedantic \
25-
--flag hie-ghc-mod:pedantic \
26-
--flag hie-ghc-tree:pedantic \
27-
--flag hie-hare:pedantic \
28-
--flag hie-plugin-api:pedantic
19+
./pedantic.sh
2920

3021
.PHONY: ghci-test
3122
ghci-test:

deploy-docs.sh

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ pip install -U Sphinx
77
set -e # exit with nonzero exit code if anything fails
88

99
# build docs generator and create docs
10-
stack build
1110
stack exec hie-docs-generator -- --prefix docs/source/
1211

1312
# run our compile script, discussed above

pedantic.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/usr/bin/env bash
2-
stack +RTS -N1 -RTS build --test \
3-
--flag hie-apply-refact:pedantic \
4-
--flag hie-base:pedantic \
5-
--flag hie-docs-generator:pedantic \
6-
--flag hie-eg-plugin-async:pedantic \
7-
--flag hie-example-plugin2:pedantic \
8-
--flag hie-ghc-mod:pedantic \
9-
--flag hie-ghc-tree:pedantic \
10-
--flag hie-hare:pedantic \
11-
--flag hie-plugin-api:pedantic \
2+
stack $@ build --test \
3+
--flag hie-apply-refact:pedantic \
4+
--flag hie-base:pedantic \
5+
--flag hie-docs-generator:pedantic \
6+
--flag hie-eg-plugin-async:pedantic \
7+
--flag hie-example-plugin2:pedantic \
8+
--flag hie-ghc-mod:pedantic \
9+
--flag hie-ghc-tree:pedantic \
10+
--flag hie-hare:pedantic \
11+
--flag hie-plugin-api:pedantic \

0 commit comments

Comments
 (0)