summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvmchale <>2017-10-26 08:45:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-10-26 08:45:00 (GMT)
commitdbd2591c7707a6ad5ceaaf809540819e1c8f3861 (patch)
tree9ef9b9baab079b1ffcc5af4b74d1fb0ee317affb
parent3e2fdd6be4bd68a46f238f1ee10ceae9fd3ad6f9 (diff)
version 0.1.0.170.1.0.17
-rw-r--r--Justfile12
-rw-r--r--README.md11
-rw-r--r--appveyor.yml2
-rw-r--r--stack.yaml4
-rw-r--r--tomlcheck.cabal4
5 files changed, 18 insertions, 15 deletions
diff --git a/Justfile b/Justfile
index 993bb48..efe933c 100644
--- a/Justfile
+++ b/Justfile
@@ -1,17 +1,15 @@
+tokei:
+ @tokei -e README.md -e TODO.md -e data/ -e Justfile . .travis.yml
+
clean:
sn c .
-compare:
- cabal new-build -O2 --constraint='tomlcheck +native'
- cp $(fd -IH 'tomlcheck$' | tail -n1) ~/.local/bin
- bench "rust-tomlcheck --file data/sample.toml" "tomlcheck --file data/sample.toml" "rust-tomlcheck --file data/bad.toml" "tomlcheck --file data/bad.toml"
-
next:
@export VERSION=$(cat tomlcheck.cabal | grep -P -o '\d+\.\d+\.\d+\.\d+' tomlcheck.cabal | head -n1 | awk -F. '{$NF+=1; print $0}' | sed 's/ /\./g') && echo $VERSION && sed -i "2s/[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+/$VERSION/" tomlcheck.cabal
git commit -am "for release"
bench:
- bench "tomlcheck --file data/example.toml" "tomlcheck --file data/good.toml"
+ bench "tomlcheck --file data/sample.toml"
upload:
rm -rf dist/
@@ -19,7 +17,7 @@ upload:
cabal upload $(fd '.tar.gz$' -IH) --publish
install:
- cabal new-build
+ cabal new-build -O2
cp $(fd -IH 'tomlcheck$' | tail -n1) ~/.local/bin
release:
diff --git a/README.md b/README.md
index c61aea4..06a6a14 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,12 @@ A sample script for your `.travis.yml` file:
```yaml
test:
- - wget https://github.com/vmchale/tomlcheck/releases/download/0.1.0.8/tomlcheck-x86_64-unkown-linux-gnu -O tomlcheck
- - chmod a+x tomlcheck
- - ./tomlcheck --file data/sample.toml
+ - |
+ if [ `uname` = "Darwin" ]
+ then
+ echo 'skipping tomlcheck download...'
+ else
+ wget https://github.com/vmchale/tomlcheck/releases/download/0.1.0.8/tomlcheck-x86_64-unkown-linux-gnu -O tomlcheck
+ chmod a+x tomlcheck
+ ./tomlcheck --file data/sample.toml
```
diff --git a/appveyor.yml b/appveyor.yml
index 184bac9..042004a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,7 +18,7 @@ test_script:
- stack update
- echo "" | stack --no-terminal install
- ps: Get-ChildItem . -name -recurse tomlcheck.exe
- - ps: Copy-Item c:\\stack\\.stack-work\\install\\afd8a623\\bin\\tomlcheck.exe tomlcheck-x86_64-pc-windows.exe
+ - ps: Copy-Item c:\stack\.stack-work\install\e6126bd7\bin\tomlcheck.exe tomlcheck-x86_64-pc-windows.exe
- ps: Push-AppveyorArtifact tomlcheck-x86_64-pc-windows.exe
deploy:
diff --git a/stack.yaml b/stack.yaml
index a43a89a..cc45276 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,9 +1,9 @@
-resolver: lts-9.6
+resolver: nightly-2017-10-13
packages:
- './'
extra-deps:
- megaparsec-6.2.0
- - htoml-megaparsec-1.0.1.8
+ - htoml-megaparsec-1.0.1.11
- composition-prelude-0.1.1.0
flags:
tomlcheck:
diff --git a/tomlcheck.cabal b/tomlcheck.cabal
index 25378f3..73a8c1e 100644
--- a/tomlcheck.cabal
+++ b/tomlcheck.cabal
@@ -1,5 +1,5 @@
name: tomlcheck
-version: 0.1.0.14
+version: 0.1.0.17
synopsis: Command-line tool to check syntax of TOML files
description: This is a command-line wrapper around htoml-megaparsec.
It is intended to be used as a syntax checker that can be
@@ -41,7 +41,7 @@ library
hs-source-dirs: src
exposed-modules: Toml.Checker
build-depends: base >= 4.8 && < 5
- , htoml-megaparsec >= 1.0.1.8
+ , htoml-megaparsec >= 1.0.1.11
, optparse-generic
, megaparsec >= 6.0
, text