diff options
| author | Philipp A. Hartmann <pah@qo.cx> | 2014-07-09 10:01:25 +0400 |
|---|---|---|
| committer | Philipp A. Hartmann <pah@qo.cx> | 2014-07-09 10:01:25 +0400 |
| commit | b3665606a93bcc3ab97a6b2409d2cee8be8d5d19 (patch) | |
| tree | 9c18b8cdf4d762e1789a9f87dba5311ad8cb709f /build | |
| parent | a5b39958eae17ac71eec2ca4faf24e47da592108 (diff) | |
fixup travis doxygen build
Diffstat (limited to 'build')
| -rwxr-xr-x | build/travis-doxygen.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build/travis-doxygen.sh b/build/travis-doxygen.sh index 8e642693..4d1d57b0 100755 --- a/build/travis-doxygen.sh +++ b/build/travis-doxygen.sh @@ -63,10 +63,11 @@ gh_pages_prepare() cd "${TRAVIS_BUILD_DIR}/doc"; [ ! -d "html" ] || \ 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 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 rm -f .git/index git clean -df @@ -75,7 +76,7 @@ gh_pages_prepare() gh_pages_commit() { cd "${TRAVIS_BUILD_DIR}/doc/html"; git add --all; - git commit -m "Automatic doxygen build"; + git diff-index --quiet HEAD || git commit -m "Automatic doxygen build"; } gh_pages_push() { |