From 516b8c9e38a668619ae93be4093954241088d99d Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 19 May 2016 10:36:58 -0700 Subject: [PATCH] [Website] #901 Automate build process - Updated build SHA --- build-docs.sh | 10 ++++++---- circle.yml | 6 ++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build-docs.sh b/build-docs.sh index 9fdfdc91d3..87ada35524 100755 --- a/build-docs.sh +++ b/build-docs.sh @@ -22,13 +22,14 @@ #* at runtime from the About dialog for additional information. #***************************************************************************** -# Script to build and deploy docs to github pages. +# Script to build and deploy docs. OUTPUT_DIRECTORY="target/docs" +# Docs, once built, are pushed to the private website repo REPOSITORY_URL="git@github.com:nasa/openmct-website.git" WEBSITE_DIRECTORY="website" -BUILD_SHA=`git rev-parse head` +BUILD_SHA=`git rev-parse HEAD` # A remote will be created for the git repository we are pushing to. # Don't worry, as this entire directory will get trashed inbetween builds. @@ -55,6 +56,7 @@ git config user.name "BuildBot" echo "git add ." git add . -echo "git commit -m \"Docs updated from build build $BUILD_SHA\"" -git commit -m "Docs updated from build build $BUILD_SHA" +echo "git commit -m \"Docs updated from build $BUILD_SHA\"" +git commit -m "Docs updated from build $BUILD_SHA" +# Push to the website repo git push diff --git a/circle.yml b/circle.yml index 5ed3bf7147..db25ab22de 100644 --- a/circle.yml +++ b/circle.yml @@ -1,13 +1,11 @@ deployment: production: branch: master - heroku: - appname: openmctweb-demo - website: - branch: openmct-website commands: - npm install canvas nomnoml - ./build-docs.sh + heroku: + appname: openmctweb-demo openmct-demo: branch: live_demo heroku: