master merge

Author: formly-bot

package.json

@@ -29,7 +29,7 @@
     "code-checks": "eslint src/",
     "commit": "git-cz",
     "publish:latest": "with-package scripts/publish-latest.sh pkg.version",
-    "semantic-release": "semantic-release pre && npm run build && npm publish && npm run publish:latest && semantic-release post"
+    "semantic-release": "semantic-release pre && npm run build && npm run publish:latest"
   },
   "betterScripts": {
     "build:dist": {
@@ -137,4 +137,4 @@
   "czConfig": {
     "path": "node_modules/cz-conventional-changelog"
   }
-}
+}

scripts/publish-latest.sh

@@ -7,18 +7,23 @@ echo "setting global bot config"
 git config --global user.email [email protected]
 git config --global user.name formly-bot
 
-echo "setting remote"
-git remote set-url origin https://formly-bot:$BOT_GH_TOKEN@github.com/formly-js/angular-formly.git >/dev/null 2>/dev/null
-
-echo "merging master"
-git merge origin/master -m "master merge" -X theirs
-
 echo "adding dist"
 git add dist package.json
 
 echo "committing with $F_VERSION"
 git commit -m v$F_VERSION --no-verify
 
+echo "setting remote"
+git remote set-url origin https://formly-bot:$BOT_GH_TOKEN@github.com/formly-js/angular-formly.git >/dev/null 2>/dev/null
+
+echo "checking out latest"
+git remote set-branches --add origin latest # required because travis clones with --branch=master
+git fetch origin
+git checkout latest
+
+echo "merging master"
+git merge master -m "master merge" -X theirs
+
 echo "pushing"
 git push origin HEAD:latest -f >/dev/null 2>/dev/null