Merge branch 'master' into update-readme-links

Author: rg911

.travis.yml

@@ -10,7 +10,7 @@ before_script:
   - npm run build
 script:
   - npm run test:cov
-  - npm install --global typedoc
+  - npm install --global typedoc typescript
   - CURRENT_VERSION=$(npm run version --silent)
   - typedoc --out "ts-docs/$CURRENT_VERSION" src
   - touch ./ts-docs/.nojekyll

travis/release.sh

@@ -9,7 +9,7 @@ if [ "$TRAVIS_BRANCH" = "$RELEASE_BRANCH" ]; then
   git remote rm $REMOTE_NAME
 
   echo "Setting remote url https://github.com/${TRAVIS_REPO_SLUG}.git"
-  git remote add $REMOTE_NAME "https://${GRGIT_USER}@github.com/${TRAVIS_REPO_SLUG}.git" > /dev/null 2>&1
+  git remote add $REMOTE_NAME "https://${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git" > /dev/null 2>&1
 
   echo "Checking out $RELEASE_BRANCH as travis leaves the head detached."
   git checkout $RELEASE_BRANCH
@@ -25,24 +25,32 @@ if [ "$TRAVIS_BRANCH" = "$RELEASE_BRANCH" ]; then
   echo ""
 
   echo "Creating tag v$CURRENT_VERSION"
-  git tag "v$CURRENT_VERSION"
-  echo ""
+  git tag -fa "v$CURRENT_VERSION" -m "Releasing version $CURRENT_VERSION"
 
   cp travis/.npmrc $HOME/.npmrc
 
-  echo "Releasing sdk artifacts"
-  npm publish
-  echo ""
+  #  The $SKIP_RELEASE_PUBLISH env variable can avoid republishing the same version to npm if something in the release process fails.
+  if [ "$SKIP_RELEASE_PUBLISH" = "true" ]; then
+    echo "Skipping publishing of sdk artifacts"
+    echo ""
+  else
+    echo "Publishing SDK artifacts"
+    npm publish
+    echo ""
+  fi
 
   echo "Increasing sdk version"
-  npm version patch  -m "Increasing version to %s"  --git-tag-version false
+  npm version patch -m "Increasing version to %s" --git-tag-version false
 
   CURRENT_VERSION=$(npm run version --silent)
 
   echo "New Version"
   cat "$CURRENT_VERSION"
   echo ""
 
+  git add .
+  git commit -m "Creating new version $CURRENT_VERSION"
+
   echo "Pushing code to $REMOTE_NAME $POST_RELEASE_BRANCH"
   git push --set-upstream $REMOTE_NAME $RELEASE_BRANCH:$POST_RELEASE_BRANCH
   echo "Pushing tags to $REMOTE_NAME"