Skip to content

Commit

Permalink
fixed: rules' execution order.
Browse files Browse the repository at this point in the history
  • Loading branch information
diasbruno committed Feb 26, 2020
1 parent 83c8c23 commit bb76272
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,6 @@ check-working-tree:
@[ -z "`git status -s`" ] && \
echo "Stopping publish. There are change to commit or discard." || echo "Worktree is clean."

changelog:
@echo "[Updating CHANGELOG.md $(CURRENT_VERSION) > $(VERSION)]"
python ./scripts/changelog.py -a $(VERSION) > CHANGELOG.md

compile:
@echo "[Compiling source]"
$(BABEL) src --out-dir lib
Expand All @@ -89,8 +85,17 @@ build: compile
@echo "[Building dists]"
@npx webpack --config ./scripts/webpack.dist.config.js

release-commit:
pre-release-commit:
git commit --allow-empty -m "Release v$(VERSION)."

changelog:
@echo "[Updating CHANGELOG.md $(CURRENT_VERSION) > $(VERSION)]"
python ./scripts/changelog.py -a $(VERSION) > CHANGELOG.md

update-package-version:
@cat package.json | jq '.version=$(VERSION)' > tmp; mv -f tmp package.json

release-commit: pre-release-commit update-package-version changelog
@git add .
@git commit --amend -m "`git log -1 --format=%s`"

Expand All @@ -102,7 +107,7 @@ publish-version: release-commit release-tag
git push $(REMOTE) "$(BRANCH)" "v$(VERSION)"
npm publish

pre-publish: clean changelog
pre-publish: clean
pre-build: deps-project tests-single-run build

publish: check-working-tree pre-publish pre-build publish-version publish-finished
Expand Down

0 comments on commit bb76272

Please sign in to comment.