From ca95da7e772de22d48499eeb03b3ea60b0b8b8cd Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 20 Oct 2015 13:25:53 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- ghpages.sh | 24 ++- spring-cloud-config.html | 365 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 360 insertions(+), 29 deletions(-) diff --git a/ghpages.sh b/ghpages.sh index 91905757..e1063ce3 100644 --- a/ghpages.sh +++ b/ghpages.sh @@ -12,13 +12,20 @@ if ! [ -d docs/target/generated-docs ]; then exit 0 fi +# Find name of current branch +################################################################### +branch=$TRAVIS_BRANCH +[ "$branch" == "" ] && branch=`git rev-parse --abbrev-ref HEAD` +target=. +if [ "$branch" != "master" ]; then target=./$branch; mkdir -p $target; fi + # Stash any outstanding changes ################################################################### git diff-index --quiet HEAD dirty=$? if [ "$dirty" != "0" ]; then git stash; fi -# Switch to gh-pages branch to sync it with master +# Switch to gh-pages branch to sync it with current branch ################################################################### git checkout gh-pages @@ -26,21 +33,22 @@ for f in docs/target/generated-docs/*; do file=${f#docs/target/generated-docs/*} if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then # Not ignored... - cp -rf $f . - git add -A $file + cp -rf $f $target + git add -A $target/$file fi done -git commit -a -m "Sync docs from master to gh-pages" +git add -A README.adoc || echo "No change to README.adoc" +git commit -a -m "Sync docs from $branch to gh-pages" || echo "Nothing committed" # Uncomment the following push if you want to auto push to -# the gh-pages branch whenever you commit to master locally. +# the gh-pages branch whenever you commit to branch locally. # This is a little extreme. Use with care! ################################################################### -git push origin gh-pages +git push origin gh-pages || echo "Cannot push gh-pages" -# Finally, switch back to the master branch and exit block -git checkout master +# Finally, switch back to the current branch and exit block +git checkout $branch if [ "$dirty" != "0" ]; then git stash pop; fi exit 0 diff --git a/spring-cloud-config.html b/spring-cloud-config.html index 3e9b7fe0..3aacc74c 100644 --- a/spring-cloud-config.html +++ b/spring-cloud-config.html @@ -429,9 +429,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
  • Key Management
  • Creating a Key Store for Testing
  • Using Multiple Keys and Key Rotation
    • -
  • Embedding the Config Server
    • +
  • Serving Plain Text
    • +
  • Embedding the Config Server
    • +
  • Push Notifications and Spring Cloud Bus
  • Spring Cloud Config Client