build: use `.git-blame-ignore-revs`

[haskell/symantic-plaintext.git] / Makefile

diff --git a/Makefile b/Makefile
index 4bb36f6cc7405f4933f26a31a26d1dbc2e6e6585..c0011f10e41d9718d4d450c90f6f64a0f9ca438f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 override GHCID_OPTIONS += --no-height-limit --reverse-errors --color=always
 override REPL_OPTIONS += -ignore-dot-ghci
+override TEST_OPTIONS += --color=always
 
 cabal := $(wildcard *.cabal)
 package := $(notdir ./$(cabal:.cabal=))
@@ -70,7 +71,8 @@ tar:
        cabal sdist
        cabal haddock --haddock-for-hackage --enable-doc
 upload: LANG=C
-upload: tar tag
+upload: tar
+       git tag --merged | grep -Fqx $(package)-$(version)
        git push --follow-tags $(GIT_PUSH_FLAGS)
        cabal upload $(CABAL_UPLOAD_FLAGS) "$(cabal_builddir)"/sdist/$(package)-$(version).tar.gz
        cabal upload $(CABAL_UPLOAD_FLAGS) --documentation "$(cabal_builddir)"/$(package)-$(version)-docs.tar.gz