summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvmchale <>2017-10-16 21:41:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-10-16 21:41:00 (GMT)
commit3e2fdd6be4bd68a46f238f1ee10ceae9fd3ad6f9 (patch)
treeb9befd6e5814a8544d3fe91661906032c81a553b
parent03188c191264611e5640a5ef93ac81070402ee50 (diff)
version 0.1.0.140.1.0.14
-rw-r--r--.travis.yml13
-rw-r--r--Justfile4
-rw-r--r--appveyor.yml1
-rw-r--r--src/Toml/Checker.hs1
-rw-r--r--stack.yaml6
-rw-r--r--tomlcheck.cabal4
6 files changed, 19 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index fd3bc3d..a65fa3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,6 +36,7 @@ install:
- stack install hlint weeder
script:
+ - stack update
- stack --no-terminal build --haddock --no-haddock-deps
- hlint .
- weeder .
@@ -49,9 +50,15 @@ script:
- echo $BINPATH
- mv $BINPATH tomlcheck-$TARGET
- ls tomlcheck-$TARGET
- - 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
+ fi
deploy:
api_key:
diff --git a/Justfile b/Justfile
index 44e8c1b..993bb48 100644
--- a/Justfile
+++ b/Justfile
@@ -6,10 +6,9 @@ compare:
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"
-#bench "rust-tomlcheck --file data/example.toml" "tomlcheck --file data/example.toml" "rust-tomlcheck --file data/good.toml" "tomlcheck --file data/good.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"
@@ -26,6 +25,7 @@ install:
release:
git tag "$(grep -P -o '\d+\.\d+\.\d+\.\d+' tomlcheck.cabal | head -n1)"
git push origin --tags
+ git tag -d "$(grep -P -o '\d+\.\d+\.\d+\.\d+' tomlcheck.cabal | head -n1)"
name:
github-release edit -s $(cat .git-token) -u vmchale -r tomlcheck -n "$(madlang run ~/programming/madlang/releases/releases.mad)" -t "$(grep -P -o '\d+\.\d+\.\d+\.\d+' tomlcheck.cabal | head -n1)"
diff --git a/appveyor.yml b/appveyor.yml
index 5286753..184bac9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,6 +15,7 @@ environment:
test_script:
- stack setup > nul
+ - 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
diff --git a/src/Toml/Checker.hs b/src/Toml/Checker.hs
index 051ec81..555d297 100644
--- a/src/Toml/Checker.hs
+++ b/src/Toml/Checker.hs
@@ -33,4 +33,3 @@ exec = do
Left e -> do
putStrLn $ parseErrorPretty e
exitWith (ExitFailure 1)
-
diff --git a/stack.yaml b/stack.yaml
index b705723..a43a89a 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -3,7 +3,9 @@ packages:
- './'
extra-deps:
- megaparsec-6.2.0
- - htoml-megaparsec-1.0.1.6
+ - htoml-megaparsec-1.0.1.8
- composition-prelude-0.1.1.0
-flags: {}
+flags:
+ tomlcheck:
+ optimize: true
extra-package-dbs: []
diff --git a/tomlcheck.cabal b/tomlcheck.cabal
index 319b2e1..25378f3 100644
--- a/tomlcheck.cabal
+++ b/tomlcheck.cabal
@@ -1,5 +1,5 @@
name: tomlcheck
-version: 0.1.0.9
+version: 0.1.0.14
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.6
+ , htoml-megaparsec >= 1.0.1.8
, optparse-generic
, megaparsec >= 6.0
, text