0.36

ingydotnet · Jun 22, 2014 · 39b4be3 · 39b4be3
1 parent c0b1f1c
commit 39b4be3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,3 +28,8 @@ notifications:
     - irc.freenode.net#testml
     on_success: change
     on_failure: always
+
+# Hack to not run on tag pushes:
+branches:
+  except:
+  - /^v?[0-9]+\.[0-9]+/
diff --git a/Changes b/Changes
@@ -1,4 +1,9 @@
 ---
+version: 0.36
+date:    Sun Jun 22 16:22:12 PDT 2014
+changes:
+- Use manual VERSION
+---
 version: 0.35
 date:    Sun Jun 15 13:01:01 PDT 2014
 changes:

diff --git a/Makefile b/Makefile
@@ -36,8 +36,8 @@ help:
 	@echo '    make distshell - Open new shell into new distdir'
 	@echo '    make disttest  - Run the dist tests'
 	@echo ''
-	@echo '    make publish   - Publish the dist to CPAN'
-	@echo '    make preflight - Dryrun of publish'
+	@echo '    make release   - Release the dist to CPAN'
+	@echo '    make preflight - Dryrun of release'
 	@echo ''
 	@echo '    make readme    - Make the ReadMe.pod file'
 	@echo '    make travis    - Make a travis.yml file'
@@ -53,7 +53,8 @@ install: distdir
 	(cd $(DISTDIR); perl Makefile.PL; make install)
 	make clean
 
-update: makefile readme travis
+update: makefile
+	make readme travis version
 
 cpan:
 	zild-make-cpan
@@ -83,23 +84,25 @@ distshell: distdir
 disttest: cpan
 	(cd cpan; dzil test) && make clean
 
-publish release: update test check-release disttest
+release: clean update check-release test disttest
 	make dist
 	cpan-upload $(DIST)
 	git push
 	git tag $(VERSION)
 	git push --tag
 	make clean
 	git status
+	@[ -n "$$(which cowsay)" ] && cowsay "$(DIST)"
 
-preflight: update test check-release disttest
+preflight: clean update check-release test disttest
 	make dist
 	@echo cpan-upload $(DIST)
 	@echo git push
 	@echo git tag $(VERSION)
 	@echo git push --tag
 	make clean
 	git status
+	@[ -n "$$(which cowsay)" ] && cowsay "$(DIST) Released!!!"
 
 readme:
 	kwim --pod-cpan doc/$(NAMEPATH).kwim > ReadMe.pod
@@ -121,13 +124,8 @@ ifeq (Zilla-Dist,$(NAME))
 makefile:
 	@echo Skip 'make upgrade'
 else
-makefile:
-	cp Makefile /tmp/
-	make upgrade
-	@if [ -n "`diff Makefile /tmp/Makefile`" ]; then \
-	    echo "Makefile updated. Try again"; \
-	    exit 1; \
-	fi
-	rm /tmp/Makefile
+makefile: upgrade
 endif
 
+version:
+	zild-version-update
diff --git a/Meta b/Meta
@@ -1,7 +1,7 @@
 =meta: 0.0.1
 
 name: TestML
-version: 0.35
+version: 0.36
 abstract: A Generic Software Testing Meta Language
 homepage: http://testml.org
 

diff --git a/lib/TestML.pm b/lib/TestML.pm
@@ -1,6 +1,7 @@
 package TestML;
 
 use TestML::Base;
+our $VERSION = '0.36';
 
 has runtime => ();
 has compiler => ();