From c1afdc8df21d4cfb3282cfd7013250647cc6f205 Mon Sep 17 00:00:00 2001 From: "Philipp A. Hartmann" Date: Sat, 12 Jul 2014 19:56:30 +0200 Subject: [PATCH] travis-doxygen.sh: allow overriding GitHub repo from environment --- .travis.yml | 1 + build/travis-doxygen.sh | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c15e2c6..2aab9a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ env: - CONF=debug - CONF=release global: + - GITHUB_REPO='miloyip/rapidjson' # prepare for 32/64 bit multi-arch support - BITS=64 - secure: "HrsaCb+N66EG1HR+LWH1u51SjaJyRwJEDzqJGYMB7LJ/bfqb9mWKF1fLvZGk46W5t7TVaXRDD5KHFx9DPWvKn4gRUVkwTHEy262ah5ORh8M6n/6VVVajeV/AYt2C0sswdkDBDO4Xq+xy5gdw3G8s1A4Inbm73pUh+6vx+7ltBbk=" diff --git a/build/travis-doxygen.sh b/build/travis-doxygen.sh index 9f4b49d..894fca3 100755 --- a/build/travis-doxygen.sh +++ b/build/travis-doxygen.sh @@ -10,8 +10,8 @@ DOXYGEN_TAR=${DOXYGEN_VER}.linux.bin.tar.gz DOXYGEN_URL="http://ftp.stack.nl/pub/users/dimitri/${DOXYGEN_TAR}" DOXYGEN_BIN="/usr/local/bin/doxygen" -GHPAGES_REPO="miloyip/rapidjson" -GHPAGES_URL="https://github.com/${GHPAGES_REPO}" +: ${GITHUB_REPO:="miloyip/rapidjson"} +GITHUB_URL="https://github.com/${GITHUB_REPO}" skip() { echo "$@" 1>&2 @@ -61,7 +61,7 @@ gh_pages_prepare() cd "${TRAVIS_BUILD_DIR}/doc"; [ ! -d "html" ] || \ abort "Doxygen target directory already exists." - git clone --single-branch -b gh-pages ${GHPAGES_URL} html + git clone --single-branch -b gh-pages ${GITHUB_URL} html cd html # setup git config (with defaults) git config user.name "${GIT_NAME-travis}" @@ -90,7 +90,7 @@ gh_pages_push() { cd "${TRAVIS_BUILD_DIR}/doc/html"; # setup credentials (hide in "set -x" mode) git config core.askpass 'bash -c ":"' - ( set +x ; git config credential.${GHPAGES_URL}.username "${GH_TOKEN}" ) + ( set +x ; git config credential.${GITHUB_URL}.username "${GH_TOKEN}" ) # push to GitHub git push origin gh-pages || \ skip "GitHub pages update failed, temporarily ignored."