Separate version bumping and release tagging steps.
This commit is contained in:
parent
f4360bf82b
commit
e7f79ed46f
19
Makefile
19
Makefile
@ -15,7 +15,7 @@ else
|
|||||||
endif
|
endif
|
||||||
CP = $(call CAT,$<,$@)
|
CP = $(call CAT,$<,$@)
|
||||||
|
|
||||||
npgoals := clean cleanrel cleanweb cleanfull withtests tag wrapped $(foreach i,1 2 3 4,bump$(i)) beta stable web update updatehard
|
npgoals := clean cleanrel cleanweb cleanfull withtests wrapped $(foreach i,1 2 3 4,bump$(i)) tag tagcommit beta stable web update updatehard
|
||||||
ifneq "$(filter $(npgoals),$(MAKECMDGOALS))" ""
|
ifneq "$(filter $(npgoals),$(MAKECMDGOALS))" ""
|
||||||
.NOTPARALLEL :
|
.NOTPARALLEL :
|
||||||
endif
|
endif
|
||||||
@ -302,27 +302,26 @@ withtests :
|
|||||||
-$(MAKE)
|
-$(MAKE)
|
||||||
echo false> .tests_enabled
|
echo false> .tests_enabled
|
||||||
|
|
||||||
ifneq "$(wildcard npm-shrinkwrap.json)" ""
|
|
||||||
|
|
||||||
tag : .events/CHANGELOG jshint release
|
|
||||||
git commit -am "Release $(meta_name) v$(version)."
|
|
||||||
git tag -a $(version) -m "$(meta_name) v$(version)."
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
wrapped : src/meta/npm-shrinkwrap.json
|
wrapped : src/meta/npm-shrinkwrap.json
|
||||||
$(call CAT,$<,npm-shrinkwrap.json)
|
$(call CAT,$<,npm-shrinkwrap.json)
|
||||||
npm install
|
npm install
|
||||||
|
|
||||||
$(foreach i,1 2 3 4,bump$(i)) :
|
$(foreach i,1 2 3 4,bump$(i)) :
|
||||||
node tools/bump.js $(subst bump,,$@)
|
node tools/bump.js $(subst bump,,$@)
|
||||||
|
$(MAKE) .events/CHANGELOG
|
||||||
|
|
||||||
|
tag :
|
||||||
$(MAKE) all
|
$(MAKE) all
|
||||||
git add builds
|
git add builds
|
||||||
$(MAKE) cleanrel
|
$(MAKE) cleanrel
|
||||||
$(MAKE) wrapped
|
$(MAKE) wrapped
|
||||||
$(MAKE) all
|
$(MAKE) all
|
||||||
git diff --quiet -- builds
|
git diff --quiet -- builds
|
||||||
$(MAKE) tag
|
$(MAKE) tagcommit
|
||||||
|
|
||||||
|
tagcommit :
|
||||||
|
git commit -am "Release $(meta_name) v$(version)."
|
||||||
|
git tag -a $(version) -m "$(meta_name) v$(version)."
|
||||||
|
|
||||||
beta : distready
|
beta : distready
|
||||||
git tag -af beta -m "$(meta_name) v$(version)."
|
git tag -af beta -m "$(meta_name) v$(version)."
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user