From a33e77df158b1c0906e9e6560cb104e150430290 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 19 Mar 2020 10:31:33 -0400 Subject: [PATCH 01/18] Revert "Bumps boot version to 2.3.0.M3" This reverts commit 2f67da30 --- .../gs-contract-rest/complete/contract-rest-client/pom.xml | 2 +- .../gs-contract-rest/complete/contract-rest-service/pom.xml | 2 +- .../gs-contract-rest/initial/contract-rest-client/pom.xml | 2 +- .../gs-contract-rest/initial/contract-rest-service/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-build-dependencies/pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-client/pom.xml b/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-client/pom.xml index 49c23322..2ec25fdc 100644 --- a/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-client/pom.xml +++ b/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.M3 + 2.2.5.RELEASE diff --git a/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-service/pom.xml b/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-service/pom.xml index 9aa6a79e..818d9724 100644 --- a/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-service/pom.xml +++ b/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.M3 + 2.2.5.RELEASE diff --git a/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-client/pom.xml b/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-client/pom.xml index 49c23322..2ec25fdc 100644 --- a/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-client/pom.xml +++ b/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.M3 + 2.2.5.RELEASE diff --git a/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-service/pom.xml b/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-service/pom.xml index f33d53d9..f8b1d5ed 100644 --- a/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-service/pom.xml +++ b/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.M3 + 2.2.5.RELEASE diff --git a/pom.xml b/pom.xml index b69b3f79..c4bab6b5 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ ${java.version} ${basedir} ${project.artifactId} - 2.3.0.M3 + 2.2.5.RELEASE 2.2.4.BUILD-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/refdocs/ diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 230ec469..e6db042a 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.M3 + 2.2.5.RELEASE UTF-8 - 2.3.0.M3 + 2.2.5.RELEASE From fb42a2cf895fd9529a59798b535f7e44231433fa Mon Sep 17 00:00:00 2001 From: Jay Bryant Date: Tue, 21 Apr 2020 12:39:13 -0500 Subject: [PATCH 02/18] Upgrade spring-doc-resources Upgrade spring-doc-resources from version 0.2.0 to version 0.2.1 to get a bug fix (setting the width of the HTML output). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c4bab6b5..95292286 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 2.2.4.BUILD-SNAPSHOT ${project.build.directory}/build-docs ${project.build.directory}/refdocs/ - 0.1.0.RELEASE + 0.2.1.RELEASE 0.1.3.RELEASE 1.5.0-alpha.18 From dae472a17d24dfbb9a75e28802fd7deb1ebd3538 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 22 Apr 2020 10:51:16 -0400 Subject: [PATCH 03/18] Updates README.adoc --- README.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.adoc b/README.adoc index 2b1b0bda..76f24e24 100644 --- a/README.adoc +++ b/README.adoc @@ -337,6 +337,8 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you ${project.version}@ ${github-tag}@ ${version-type}@ + + ${docs-url}@ ${raw-docs-url}@ ${project.version}@ From def18bdd4e0fd2392fd08bb07e66d576b5b28f37 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 23 Apr 2020 16:36:27 +0200 Subject: [PATCH 04/18] Suppress javadoc check for files in test directory. --- .../src/checkstyle/checkstyle-suppressions.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml index f5f67058..b7204284 100644 --- a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml +++ b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml @@ -9,6 +9,7 @@ + From be6c1eae8068e704680d1351856bade03cfa22f8 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 23 Apr 2020 16:36:27 +0200 Subject: [PATCH 05/18] Suppress javadoc check for files in test directory. --- .../src/checkstyle/checkstyle-suppressions.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml index f5f67058..b7204284 100644 --- a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml +++ b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml @@ -9,6 +9,7 @@ + From eee1278025656421432d7a72e454ca010fd29d2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2020 18:01:11 +0000 Subject: [PATCH 06/18] Bump checkstyle from 8.18 to 8.29 Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.18 to 8.29. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.18...checkstyle-8.29) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95292286..48cfc30a 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 2.10 ${maven-checkstyle-plugin.version} - 8.18 + 8.29 0.0.9 2.22.1 3.1.0 From 46c9d176a0f123ac45df5dbc740c97fb2c898379 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2020 18:01:11 +0000 Subject: [PATCH 07/18] Bump checkstyle from 8.18 to 8.29 Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.18 to 8.29. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.18...checkstyle-8.29) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d040cccc..d1dc3d29 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 2.10 ${maven-checkstyle-plugin.version} - 8.18 + 8.29 0.0.9 2.22.1 3.1.0 From 82cecb77d3dacef994ef89a2f3a7170491b99b09 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 24 Apr 2020 14:06:31 +0200 Subject: [PATCH 08/18] Adjust to updates. --- pom.xml | 2 +- .../src/checkstyle/checkstyle-suppressions.xml | 4 +--- spring-cloud-build-tools/src/main/resources/checkstyle.xml | 5 ----- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index d1dc3d29..5f767d78 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 2.2.1 1.16 0.0.7 - 3.0.0 + 3.1.1 false true true diff --git a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml index b7204284..2fb36263 100644 --- a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml +++ b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml @@ -3,13 +3,11 @@ "-//Puppy Crawl//DTD Suppressions 1.1//EN" "https://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> - - + diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle.xml b/spring-cloud-build-tools/src/main/resources/checkstyle.xml index e140830d..c3e1de40 100644 --- a/spring-cloud-build-tools/src/main/resources/checkstyle.xml +++ b/spring-cloud-build-tools/src/main/resources/checkstyle.xml @@ -122,11 +122,6 @@ - - - - - From a6633729c611821a2a2a9d9609a080b7745ee533 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 24 Apr 2020 14:57:10 +0200 Subject: [PATCH 09/18] Revert "Adjust to updates." This reverts commit 82cecb77d3dacef994ef89a2f3a7170491b99b09. --- pom.xml | 2 +- .../src/checkstyle/checkstyle-suppressions.xml | 4 +++- spring-cloud-build-tools/src/main/resources/checkstyle.xml | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5f767d78..d1dc3d29 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 2.2.1 1.16 0.0.7 - 3.1.1 + 3.0.0 false true true diff --git a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml index 2fb36263..b7204284 100644 --- a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml +++ b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml @@ -3,11 +3,13 @@ "-//Puppy Crawl//DTD Suppressions 1.1//EN" "https://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> + - + diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle.xml b/spring-cloud-build-tools/src/main/resources/checkstyle.xml index c3e1de40..e140830d 100644 --- a/spring-cloud-build-tools/src/main/resources/checkstyle.xml +++ b/spring-cloud-build-tools/src/main/resources/checkstyle.xml @@ -122,6 +122,11 @@ + + + + + From ea85edf36ab815c1298a2b3964f73e7214944a02 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 24 Apr 2020 14:57:29 +0200 Subject: [PATCH 10/18] Revert "Bump checkstyle from 8.18 to 8.29" This reverts commit 46c9d176a0f123ac45df5dbc740c97fb2c898379. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d1dc3d29..d040cccc 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 2.10 ${maven-checkstyle-plugin.version} - 8.29 + 8.18 0.0.9 2.22.1 3.1.0 From bfa24ff9818ff5e6ed5f0d3fbfb3902e30c84c82 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 24 Apr 2020 15:08:26 +0200 Subject: [PATCH 11/18] Revert "Bump checkstyle from 8.18 to 8.29" This reverts commit eee1278025656421432d7a72e454ca010fd29d2f. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 48cfc30a..95292286 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 2.10 ${maven-checkstyle-plugin.version} - 8.29 + 8.18 0.0.9 2.22.1 3.1.0 From 76873a53ab7201150873599a5b0101f1bd8c86da Mon Sep 17 00:00:00 2001 From: maaaace Date: Sun, 3 May 2020 19:01:07 +0800 Subject: [PATCH 12/18] fix(bashScript): download shellcheck to support arm64 processor build_helper.sh just downloads shellcheck for x86_64 architecture by hard coding the verison and arch of zip file. Fortunately shellcheck starts to support arm64 since version 0.7.0, as a result update the version and add checking for architecture to support arm64. Signed-off-by: maaaace --- docs/src/test/bash/build-helper.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/src/test/bash/build-helper.sh b/docs/src/test/bash/build-helper.sh index 818c58e6..fea326b4 100755 --- a/docs/src/test/bash/build-helper.sh +++ b/docs/src/test/bash/build-helper.sh @@ -20,13 +20,17 @@ if [[ $# -ne 1 ]]; then usage fi -SHELLCHECK_VERSION="v0.6.0" +SHELLCHECK_VERSION="v0.7.0" +ARCH="x86_64" +if [ "$(uname -m)" == aarch64 ]; then + ARCH="aarch64" +fi SHELLCHECK_BIN="${ROOT_DIR}/../target/shellcheck-${SHELLCHECK_VERSION}/shellcheck" case $1 in download-shellcheck) if [[ "${OSTYPE}" == linux* && ! -z "${SHELLCHECK_BIN}" ]]; then - SHELLCHECK_ARCHIVE="shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" + SHELLCHECK_ARCHIVE="shellcheck-${SHELLCHECK_VERSION}.linux.${ARCH}.tar.xz" if [[ -x "${ROOT_DIR}/../target/shellcheck-${SHELLCHECK_VERSION}/shellcheck" ]]; then echo "shellcheck already downloaded - skipping..." exit 0 From d673bca4da923950a532f9b85b4b94897e01dad7 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 8 May 2020 12:23:05 -0400 Subject: [PATCH 13/18] Updates bats tests to cloe bats-support and bats-assert This along with upgrading to 0.7.0 of bats seems to fix bats tests. Fixes gh-150 --- docs/pom.xml | 1 - docs/src/test/bash/build-helper.sh | 2 ++ docs/src/test/bats/ghpages.bats | 4 ++-- docs/src/test/bats/update-guides.bats | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index c2d981a0..9e101941 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -209,7 +209,6 @@ ${skipTests} - true ${basedir}/src/test/bash/run-bats.sh diff --git a/docs/src/test/bash/build-helper.sh b/docs/src/test/bash/build-helper.sh index fea326b4..8308c252 100755 --- a/docs/src/test/bash/build-helper.sh +++ b/docs/src/test/bash/build-helper.sh @@ -59,6 +59,8 @@ case $1 in exit 0 fi git clone https://github.com/bats-core/bats-core.git "${ROOT_DIR}/../target/bats" + git clone https://github.com/ztombol/bats-support.git "${ROOT_DIR}/target/test_helper/bats-support" + git clone https://github.com/ztombol/bats-assert "${ROOT_DIR}/target/test_helper/bats-assert" ;; run-bats) echo "Running bats" diff --git a/docs/src/test/bats/ghpages.bats b/docs/src/test/bats/ghpages.bats index 6bd942d8..54ae2376 100644 --- a/docs/src/test/bats/ghpages.bats +++ b/docs/src/test/bats/ghpages.bats @@ -1,8 +1,8 @@ #!/usr/bin/env bats load 'test_helper' -load 'test_helper/bats-support/load' -load 'test_helper/bats-assert/load' +load '../../../target/test_helper/bats-support/load' +load '../../../target/test_helper/bats-assert/load' setup() { export TEMP_DIR="$( mktemp -d )" diff --git a/docs/src/test/bats/update-guides.bats b/docs/src/test/bats/update-guides.bats index fc7871bc..e45a3183 100644 --- a/docs/src/test/bats/update-guides.bats +++ b/docs/src/test/bats/update-guides.bats @@ -1,8 +1,8 @@ #!/usr/bin/env bats load 'test_helper' -load 'test_helper/bats-support/load' -load 'test_helper/bats-assert/load' +load '../../../target/test_helper/bats-support/load' +load '../../../target/test_helper/bats-assert/load' setup() { export TEMP_DIR="$( mktemp -d )" From c7ebf03a2a5b7b28fbc11e1a49fa7c27020d07cd Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 8 May 2020 13:10:50 -0400 Subject: [PATCH 14/18] removes checked in bats libs --- docs/src/test/bats/test_helper/bats-assert | 1 - docs/src/test/bats/test_helper/bats-support | 1 - 2 files changed, 2 deletions(-) delete mode 160000 docs/src/test/bats/test_helper/bats-assert delete mode 160000 docs/src/test/bats/test_helper/bats-support diff --git a/docs/src/test/bats/test_helper/bats-assert b/docs/src/test/bats/test_helper/bats-assert deleted file mode 160000 index 9f88b420..00000000 --- a/docs/src/test/bats/test_helper/bats-assert +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9f88b4207da750093baabc4e3f41bf68f0dd3630 diff --git a/docs/src/test/bats/test_helper/bats-support b/docs/src/test/bats/test_helper/bats-support deleted file mode 160000 index 004e7076..00000000 --- a/docs/src/test/bats/test_helper/bats-support +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 004e707638eedd62e0481e8cdc9223ad471f12ee From bb2126974fef122cfbbcfadd330e1ee018721a42 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 8 May 2020 13:34:34 -0400 Subject: [PATCH 15/18] set current branch for test --- docs/src/test/bats/ghpages.bats | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/test/bats/ghpages.bats b/docs/src/test/bats/ghpages.bats index 54ae2376..a7a6f045 100644 --- a/docs/src/test/bats/ghpages.bats +++ b/docs/src/test/bats/ghpages.bats @@ -84,6 +84,7 @@ export -f printing_git_with_remotes export -f stubbed_git @test "should upload the built docs to the root of gh-pages for snapshot versions" { + export CURRENT_BRANCH=master export GIT_BIN="stubbed_git" export SOURCE_FUNCTIONS="" export RELEASER_GIT_OAUTH_TOKEN="mytoken" From 2821e3222cde688dfb700c52f9e2d3db48a407bc Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 8 May 2020 13:36:21 -0400 Subject: [PATCH 16/18] set current branch for test --- docs/src/test/bats/ghpages.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/test/bats/ghpages.bats b/docs/src/test/bats/ghpages.bats index a7a6f045..05cf0d8a 100644 --- a/docs/src/test/bats/ghpages.bats +++ b/docs/src/test/bats/ghpages.bats @@ -84,7 +84,7 @@ export -f printing_git_with_remotes export -f stubbed_git @test "should upload the built docs to the root of gh-pages for snapshot versions" { - export CURRENT_BRANCH=master + export BRANCH=master export GIT_BIN="stubbed_git" export SOURCE_FUNCTIONS="" export RELEASER_GIT_OAUTH_TOKEN="mytoken" From fe89ee7de08887380faea76b0ed03fba4e30a334 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 8 May 2020 13:40:16 -0400 Subject: [PATCH 17/18] set current branch for test --- docs/src/main/asciidoc/ghpages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh index bcee92e9..c286d792 100755 --- a/docs/src/main/asciidoc/ghpages.sh +++ b/docs/src/main/asciidoc/ghpages.sh @@ -85,6 +85,7 @@ function retrieve_current_branch() { # Code getting the name of the current branch. For master we want to publish as we did until now # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch # If there is a branch already passed will reuse it - otherwise will try to find it + echo "BRANCH=${BRANCH}" CURRENT_BRANCH=${BRANCH} if [[ -z "${CURRENT_BRANCH}" ]] ; then CURRENT_BRANCH=$("${GIT_BIN}" symbolic-ref -q HEAD) From 27553b9dd9c626d4928da53c79a6180cdd809b67 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 8 May 2020 13:45:06 -0400 Subject: [PATCH 18/18] set current branch for test --- docs/src/main/asciidoc/ghpages.sh | 1 - docs/src/test/bats/ghpages.bats | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh index c286d792..bcee92e9 100755 --- a/docs/src/main/asciidoc/ghpages.sh +++ b/docs/src/main/asciidoc/ghpages.sh @@ -85,7 +85,6 @@ function retrieve_current_branch() { # Code getting the name of the current branch. For master we want to publish as we did until now # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch # If there is a branch already passed will reuse it - otherwise will try to find it - echo "BRANCH=${BRANCH}" CURRENT_BRANCH=${BRANCH} if [[ -z "${CURRENT_BRANCH}" ]] ; then CURRENT_BRANCH=$("${GIT_BIN}" symbolic-ref -q HEAD) diff --git a/docs/src/test/bats/ghpages.bats b/docs/src/test/bats/ghpages.bats index 05cf0d8a..ad7a4aaa 100644 --- a/docs/src/test/bats/ghpages.bats +++ b/docs/src/test/bats/ghpages.bats @@ -112,6 +112,7 @@ export -f stubbed_git } @test "should upload the built docs to spring-cloud-static gh-pages branch for non-snapshot versions" { + export BRANCH=master export GIT_BIN="stubbed_git" export SOURCE_FUNCTIONS="" export RELEASER_GIT_OAUTH_TOKEN="mytoken" @@ -146,6 +147,7 @@ export -f stubbed_git } @test "should upload the release train docs to spring-cloud-static under the release train folder" { + export BRANCH=master export GIT_BIN="stubbed_git" export SOURCE_FUNCTIONS="" export RELEASER_GIT_OAUTH_TOKEN="mytoken" @@ -218,6 +220,7 @@ export -f stubbed_git } @test "should retrieve the name of the current branch" { + export BRANCH=master export GIT_BIN="stubbed_git" cd "${TEMP_DIR}/spring-cloud-stream/" source "${SOURCE_DIR}"/ghpages.sh