From 620f5a4adefb3d3386417c8163361a51c7c5ab5b Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 19 Aug 2019 12:54:58 +0200 Subject: [PATCH] Makes the spring cloud static repo exportable; fixes gh-140 --- docs/src/main/asciidoc/ghpages.sh | 8 +++++--- docs/src/test/bats/ghpages.bats | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh index 1e5b9d90..78ce6355 100755 --- a/docs/src/main/asciidoc/ghpages.sh +++ b/docs/src/main/asciidoc/ghpages.sh @@ -4,18 +4,20 @@ set -e -export GIT_BIN ROOT_FOLDER COMMIT_CHANGES MAVEN_PATH MAVEN_EXEC REPO_NAME SPRING_CLOUD_STATIC_REPO +export GIT_BIN ROOT_FOLDER COMMIT_CHANGES MAVEN_PATH MAVEN_EXEC REPO_NAME SPRING_CLOUD_STATIC_REPO SPRING_CLOUD_STATIC_REPO_DESTINATION export CURRENT_BRANCH PREVIOUS_BRANCH export GITHUB_REPO_USERNAME_ENV="${GITHUB_REPO_USERNAME_ENV:-GITHUB_REPO_USERNAME}" export GITHUB_REPO_PASSWORD_ENV="${GITHUB_REPO_PASSWORD_ENV:-GITHUB_REPO_PASSWORD}" REPO_USER="${!GITHUB_REPO_USERNAME_ENV}" REPO_PASS="${!GITHUB_REPO_PASSWORD_ENV}" +export SPRING_CLOUD_STATIC_REPO_DESTINATION="${SPRING_CLOUD_STATIC_REPO_DESTINATION:-$( dirname "$(mktemp)")/}" GIT_BIN="${GIT_BIN:-git}" # The script should be executed from the root folder ROOT_FOLDER="$( pwd )" -echo "Current folder is ${ROOT_FOLDER}" +echo "Current folder is [${ROOT_FOLDER}]" +echo "Spring Cloud Static repo is [${SPRING_CLOUD_STATIC_REPO_DESTINATION}]" # Set default props like MAVEN_PATH, ROOT_FOLDER etc. function set_default_props() { @@ -151,7 +153,7 @@ function add_docs_from_target() { DESTINATION_REPO_FOLDER="${ROOT_FOLDER}" elif [[ "${CLONE}" == "yes" ]]; then mkdir -p "${ROOT_FOLDER}"/target - local clonedStatic="${ROOT_FOLDER}"/target/spring-cloud-static + local clonedStatic="${SPRING_CLOUD_STATIC_REPO_DESTINATION}"/spring-cloud-static if [[ ! -e "${clonedStatic}/.git" ]]; then echo "Cloning Spring Cloud Static to target" "${GIT_BIN}" clone "${SPRING_CLOUD_STATIC_REPO}" "${clonedStatic}" && cd "${clonedStatic}" && "${GIT_BIN}" checkout gh-pages diff --git a/docs/src/test/bats/ghpages.bats b/docs/src/test/bats/ghpages.bats index 5c5a13f9..af5fe8ba 100644 --- a/docs/src/test/bats/ghpages.bats +++ b/docs/src/test/bats/ghpages.bats @@ -17,6 +17,7 @@ setup() { export SOURCE_FUNCTIONS="true" export GITHUB_REPO_USERNAME_ENV="MY_REPO_USERNAME" export GITHUB_REPO_PASSWORD_ENV="MY_REPO_PASSWORD" + export SPRING_CLOUD_STATIC_REPO_DESTINATION="${TEMP_DIR}" } teardown() {