From 6dff482e7baeef7b807a06d3dcccce9d2dc5e236 Mon Sep 17 00:00:00 2001
From: Teng-hao Chang <zhusee2@gmail.com>
Date: Wed, 4 Mar 2020 16:37:56 +0800
Subject: [PATCH 1/3] Fix deploy script to push converted tag back

---
 scripts/deploy.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index d9eea2d2..c9ebe901 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -4,7 +4,11 @@ echo "Publishing ${TRAVIS_TAG}"
 
 # convert lightweight tag to annotated tag so Lerna can use it
 git tag -a -f -m "${TRAVIS_TAG}" "${TRAVIS_TAG}" "${TRAVIS_TAG}"
-git push --force origin "${TRAVIS_TAG}"
+
+# push back tags
+git remote add tags-origin "https://ichefbot:${GH_TOKEN}@${GH_REPO}"
+git push --force tags-origin "${TRAVIS_TAG}"
+git remote remove tags-origin
 
 # publish to npm
 yarn release --yes --ignore-prepublish

From 9cd770c8c24183989686a48725427ec3fedb86b9 Mon Sep 17 00:00:00 2001
From: Teng-hao Chang <zhusee2@gmail.com>
Date: Wed, 4 Mar 2020 16:40:07 +0800
Subject: [PATCH 2/3] Always bump minor when publishing canary builds

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 90f0ea4e..76ba2aba 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "bumpversion": "lerna version --no-git-tag-version --no-push",
     "release": "lerna publish from-package",
     "release:pre": "lerna publish --dist-tag=prerelease",
-    "release:canary": "lerna publish --canary --force-publish --exact",
+    "release:canary": "lerna publish --canary minor --force-publish --exact",
     "ghpages": "lerna run ghpages",
     "lint": "npm run lint:eslint && npm run lint:stylelint",
     "lint:eslint": "eslint ./packages --ignore-path=configs/.eslintignore ./",

From 9c43ac7e3e155a2680f716cfe8b039b0162dd9b5 Mon Sep 17 00:00:00 2001
From: Teng-hao Chang <zhusee2@gmail.com>
Date: Wed, 4 Mar 2020 16:42:23 +0800
Subject: [PATCH 3/3] Update CHANGELOG about deploy script fix

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bb47865..f11e022a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+- [Build] Fix deploy script to push back converted tags; bump minor for canary builds. (#261)
+
 ## [4.2.0]
 
 ### Changed