Skip to content

R
rapidjson
Commit b3665606 authored by Philipp A. Hartmann's avatar Philipp A. Hartmann
Browse files
Options

fixup travis doxygen build

parent a5b39958
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
build/travis-doxygen.sh
View file @ b3665606
...@@ -63,10 +63,11 @@ gh_pages_prepare() ...@@ -63,10 +63,11 @@ gh_pages_prepare()
cd "${TRAVIS_BUILD_DIR}/doc"; cd "${TRAVIS_BUILD_DIR}/doc";
[ ! -d "html" ] || \ [ ! -d "html" ] || \
abort "Doxygen target directory already exists." abort "Doxygen target directory already exists."
git config --global user.name "${GIT_NAME}"
git config --global user.email "${GIT_EMAIL}"
git clone --single-branch -b gh-pages ${GHPAGES_BASE} html git clone --single-branch -b gh-pages ${GHPAGES_BASE} html
cd html cd html
# setup git config (with defaults)
git config user.name "${GIT_NAME-travis}"
git config user.email "${GIT_EMAIL-"travis@localhost"}"
# clean working dir # clean working dir
rm -f .git/index rm -f .git/index
git clean -df git clean -df
...@@ -75,7 +76,7 @@ gh_pages_prepare() ...@@ -75,7 +76,7 @@ gh_pages_prepare()
gh_pages_commit() { gh_pages_commit() {
cd "${TRAVIS_BUILD_DIR}/doc/html"; cd "${TRAVIS_BUILD_DIR}/doc/html";
git add --all; git add --all;
git commit -m "Automatic doxygen build"; git diff-index --quiet HEAD || git commit -m "Automatic doxygen build";
} }
gh_pages_push() { gh_pages_push() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment