From f0aea46bb84cd6357e01feaf927b293d93032ad3 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 11 Jun 2019 10:01:29 +0200 Subject: [PATCH] Updated gh-pages --- docs/src/main/asciidoc/ghpages.sh | 2 +- docs/src/test/bats/ghpages.bats | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh index 8107546b..3adb610a 100755 --- a/docs/src/main/asciidoc/ghpages.sh +++ b/docs/src/main/asciidoc/ghpages.sh @@ -55,7 +55,7 @@ function add_oauth_token_to_remote_url() { # Check if gh-pages exists and docs have been built function check_if_anything_to_sync() { add_oauth_token_to_remote_url - if ! ("${GIT_BIN}" remote set-branches --add origin gh-pages && "${GIT_BIN}" fetch -q) && [[ "${RELEASE_TRAIN}" != "yes" ]] ; then + if [[ "${RELEASE_TRAIN}" != "yes" ]] && ! ("${GIT_BIN}" remote set-branches --add origin gh-pages && "${GIT_BIN}" fetch -q) ; then echo "No gh-pages, so not syncing" exit 0 fi diff --git a/docs/src/test/bats/ghpages.bats b/docs/src/test/bats/ghpages.bats index 3fb9567f..cc589b7a 100644 --- a/docs/src/test/bats/ghpages.bats +++ b/docs/src/test/bats/ghpages.bats @@ -159,8 +159,6 @@ export -f stubbed_git assert_success assert_output --partial "git remote set-url --push origin https://mytoken@foo.bar/baz.git" - assert_output --partial "git remote set-branches --add origin gh-pages" - assert_output --partial "git fetch -q" # Previous branch was [master] assert_output --partial "git checkout master" assert_output --partial "Extracted 'main.adoc' from Maven build [home]"