SpringCloud/spring-cloud-build
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3.x'

Browse Source
This commit is contained in:
spencergibb
2020-05-08 13:54:45 -04:00
parent 2417705160 e84caac578
commit 2f1a258497
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/pom.xml
View File

@@ -297,7 +297,6 @@
</goals>
<configuration>
<skip>${skipTests}</skip>
<skip>true</skip>
<executable>${basedir}/src/test/bash/run-bats.sh</executable>
</configuration>
</execution>

10
docs/src/test/bash/build-helper.sh
View File

@@ -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
@@ -55,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"

8
docs/src/test/bats/ghpages.bats
View File

@@ -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 )"
@@ -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 BRANCH=master
export GIT_BIN="stubbed_git"
export SOURCE_FUNCTIONS=""
export RELEASER_GIT_OAUTH_TOKEN="mytoken"
@@ -111,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"
@@ -145,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"
@@ -217,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

4
docs/src/test/bats/update-guides.bats
View File

@@ -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 )"