Merge pull request #247 from garden-io/move-changelog

chore: move changelog to repo root
garden-io · Sep 10, 2018 · 7f010f9 · 7f010f9
2 parents 9ddb52c + 819a4ec
commit 7f010f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/garden-cli/CHANGELOG.md → CHANGELOG.md b/garden-cli/CHANGELOG.md → CHANGELOG.md
diff --git a/bin/publish b/bin/publish
@@ -9,20 +9,15 @@ cd ${garden_root}
 lerna version --no-push
 git reset HEAD~1
 
-# TODO: set this up to work with multiple packages
-cd garden-cli
-
-../node_modules/.bin/conventional-changelog -p angular -i CHANGELOG.md --commit-path . -s
+./node_modules/.bin/conventional-changelog -p angular -i CHANGELOG.md --commit-path . -s
 git add CHANGELOG.md
-version=$(node -p "require('./package.json').version")
+version=$(node -p "require('./lerna.json').version")
 git commit -m "chore(release): release ${version}"
 
-npm publish
-
-cd ..
-
 git push --tags --no-verify
 git push --no-verify
 
+# TODO: set this up to work with multiple packages
 cd garden-cli
+npm publish
 gulp update-brew