diff --git a/ghpages.sh b/ghpages.sh new file mode 100644 index 0000000..62a5b3d --- /dev/null +++ b/ghpages.sh @@ -0,0 +1,46 @@ +#!/bin/bash -x + +git remote add docs https://github.com/spring-projects/spring-cloud + +if ! (git fetch docs && git checkout --track docs/gh-pages); then + echo "No gh-pages, error" + exit 1 +fi + +if ! [ -d target/generated-docs ]; then + echo "No gh-pages sources in target/generated-docs, so not syncing" + exit 0 +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 +################################################################### +git checkout gh-pages + +for f in target/generated-docs/*; do + file=${f#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 + fi +done + +git commit -a -m "Sync docs from master to gh-pages" + +# Uncomment the following push if you want to auto push to +# the gh-pages branch whenever you commit to master locally. +# This is a little extreme. Use with care! +################################################################### +git push docs gh-pages || exit 1 + +# Finally, switch back to the master branch and exit block +git checkout master +if [ "$dirty" != "0" ]; then git stash pop; fi + +exit 0 diff --git a/images/.gitkeep b/images/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/images/Hystrix.png b/images/Hystrix.png new file mode 100644 index 0000000..7d4e17e Binary files /dev/null and b/images/Hystrix.png differ diff --git a/images/HystrixFallback.png b/images/HystrixFallback.png new file mode 100644 index 0000000..372018c Binary files /dev/null and b/images/HystrixFallback.png differ diff --git a/images/HystrixGraph.png b/images/HystrixGraph.png new file mode 100644 index 0000000..c07c6bd Binary files /dev/null and b/images/HystrixGraph.png differ diff --git a/spring-cloud.html b/spring-cloud.html index ef2fc3f..77b63d0 100644 --- a/spring-cloud.html +++ b/spring-cloud.html @@ -4,7 +4,7 @@ - + Spring Cloud