From 357bd205308c5af4b19c58e5b45ca521c62fd99c Mon Sep 17 00:00:00 2001
From: Andrew Seidl <dev@aas.io>
Date: Tue, 10 Apr 2018 14:37:16 -0700
Subject: [PATCH] docs: fix publish-docs script

Now handled by internal Jenkins instead of Travis
---
 .travis.yml                          | 2 --
 scripts/publish-docs-and-examples.sh | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b48449e41..a9b6a16c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,6 @@ notifications:
   email: false
   slack:
     secure: fOjQyz0i+vu5pxVQabYg3bXG2swgZcSyWHAtP7eTS5AfxPObujkjWT1ZluqEESb7XRYk/zrsWUJyMhaD59xfiAqXY+e4PbuuutD0myfW89+ow+/Wwv1LsehJd/1a+umqVh6TsHUvUvJh6MoBKkhtV/EJxFJ82dHH3oiZozapTYB1WRg4pyuWG42J5eT9dego0RhkJykqZMmSU2+otPwVG6V0S/oZfvXjadtaqoKxADfGwxpktaRxiZbhaX4/B8Ee+Nn/wixpkjBJSauX/QC8b8fjIYIt0f0XnZdCXbx8e0EENh4jTIbYpaUF9B2CBtIJGA6YNBMTNwTqfTOkPvDA8vtLbKsDL4FeAPjNsb7qyaiSQrtlk9I3R61XHwe78wCb8X0vE+IUuNwGfluNv7U2F2ubi/nqeo6u8vAhxWxt/Ogcpg5x7h8YqMEMq/0otQ+NKmggCES5lM4UNkX5LIWATod6agWBjef+KIvRtVcs59BUPEnXkFChuAg8IAu/FXJ+b5CciQJtUvgCmcZ54QeffS06sDG5fo5Yq0q265S99vWBRWg9nYy3WB+Y/1V5w3nNUf0xvpPScuivG6CReWerU+9KxeBoKPNYharLjY39/siWHNrLDFiBVsB807KhPx/3DVua3RWZ859qZAZl1XU/vd2Yy2U6y+3cOVV/1B9tLyg=
-after_success:
-- sh ./scripts/publish-docs-and-examples.sh
 env:
   matrix:
     secure: I3hjR+BBPHlGBnxPCu+ey/6PuPRVsbyTSUyi09DDDTIa0SWhubvZgac2UQW9IJHY5jz5EOXOmk2nf9khGlz0pJdFsr3wyHbpFoTYmW2ns2EpqtqHLiz+4sQP4PQ3XZ6WdtRt63RkLYCaFMq6QHtHtpQP4kanWSuhqV6tUgjho1mZjXOEyY2/YcfVpVd0pa6u+S5/0WJEba3l0zBYkzyTp2WtiAGte0fYvO/5Q/vlWBUkE+zIsROpFVCP8yv29jwolsoH0a/v/sEOWglwIOU5ntyInir31edVVwiG4hGT8LBYG0JZbJlJyJvudZ68I9pB5ThdFsUZKOHWADwIhzD1EFOPXR/bPDuoEC/F3mOYbDm03GADHianQrYbIaupl+i8MnCJXDZFshrbtekOwvz56tOp31IZePR6EFAJOiwTejFdel09C01bWY7Yq4y5udOcNcWj6yUCLxTUKOVFM/JuySfZavdz4NhscfyrGPpXbsGMq0sR17EjFRRPPNq5aZ2mnpMG4q59rkdKHBzO6WPLHplD3EVjiZA0N6MgXktKBrsBjRJ/FjVzEz263wV5J7iY2h1RcgXPrJRM9JfQTd9XRxw4RH6yA4Gi9AMv6pG7m4uaLzagdmuiAp7Q9sn4s+d7vM43p9FDOpWXO7U+UO49xZ8zantY6oYXnfzCpXZTsKY=
diff --git a/scripts/publish-docs-and-examples.sh b/scripts/publish-docs-and-examples.sh
index 67c38bd34..152998609 100644
--- a/scripts/publish-docs-and-examples.sh
+++ b/scripts/publish-docs-and-examples.sh
@@ -10,12 +10,12 @@ if [ "$TRAVIS_BRANCH" = "master" ]
   git config --global user.email "${COMMIT_EMAIL}"
   rm -rf ${DOWNLOAD_PATH}
   git clone "${REPO_PATH}" ${DOWNLOAD_PATH}
-  
+
   cd ${DOWNLOAD_PATH}
     npm install
     git fetch --all
     git checkout gh-pages
-    git pull --rebase origin master
+    git reset --hard origin/master
     npm run clean:docs
     npm run build:docs
     npm run build:example
@@ -23,7 +23,7 @@ if [ "$TRAVIS_BRANCH" = "master" ]
     git add example -f
     CHANGESET=$(git rev-parse --verify HEAD)
     git commit -m "Automated documentation/example build for changeset ${CHANGESET}."
-    git push origin gh-pages
+    git push -f origin gh-pages
   cd ..
   rm -rf ${DOWNLOAD_PATH}
 fi