From 919a215d121d418055acd7c58788ef4a45ede865 Mon Sep 17 00:00:00 2001 From: Chyi-Kwei Yau Date: Tue, 11 Sep 2018 10:34:20 -0400 Subject: [PATCH] Revert "update push_doc.sh to fix circleCI error" This reverts commit 0df1c1f21d4f8aa723fdee756ad47ea8db020c83. --- .circleci/config.yml | 2 +- ci_scripts/circleci/push_doc.sh | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a9674e..e952e17 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,7 +42,7 @@ jobs: - attach_workspace: at: doc/_build/html - run: ls -ltrh doc/_build/html - - run: bash ci_scripts/circleci/push_doc.sh + - run: bash ci_scripts/circleci/push_doc.sh doc/_build/html workflows: version: 2 diff --git a/ci_scripts/circleci/push_doc.sh b/ci_scripts/circleci/push_doc.sh index 629c80b..d3c0fa8 100755 --- a/ci_scripts/circleci/push_doc.sh +++ b/ci_scripts/circleci/push_doc.sh @@ -8,12 +8,8 @@ set -e MSG="Pushing the docs for revision for branch: $CIRCLE_BRANCH, commit $CIRCLE_SHA1" -cd $HOME -# Copy the build docs to a temporary folder -rm -rf tmp -mkdir tmp -cp -R $HOME/$DOC_REPO/doc/_build/html/* ./tmp/ - +GENERATED_DOC_DIR=$1 +GENERATED_DOC_DIR=$(readlink -f $GENERATED_DOC_DIR) # Clone the docs repo if it isnt already there cd $HOME @@ -42,7 +38,7 @@ for name in $(ls -A $HOME/$DOC_REPO); do done # Copy the new build docs -cp -R $HOME/tmp/ ./ +cp -R GENERATED_DOC_DIR ./ git config --global user.email $EMAIL git config --global user.name $USERNAME