Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

travis-apidoc: shellcheck fixes, especially for non-empty GH_TOKEN

This commit is contained in:
Daniel Hahler 2016-04-05 00:59:29 +02:00
parent c85bbeafdb
commit a0e98c6157
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build-utils/travis-apidoc.sh
View File

@ -14,7 +14,7 @@ echo "TRAVIS_BRANCH: $TRAVIS_BRANCH"
# GH_TOKEN won't be available for PRs from forks. # GH_TOKEN won't be available for PRs from forks.
# (http://docs.travis-ci.com/user/pull-requests/#Security-Restrictions-when-testing-Pull-Requests). # (http://docs.travis-ci.com/user/pull-requests/#Security-Restrictions-when-testing-Pull-Requests).
if [ -z "GH_TOKEN" ]; then if [ -z "$GH_TOKEN" ]; then
echo "No GH_TOKEN available. Skipping." echo "No GH_TOKEN available. Skipping."
exit exit
fi fi
@ -32,7 +32,7 @@ export GIT_AUTHOR_EMAIL="awesome-robot@users.noreply.github.com"
export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME" export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"
export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL" export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"
git clone --quiet --branch gh-pages $REPO_APIDOC build/apidoc git clone --quiet --branch gh-pages "$REPO_APIDOC" build/apidoc
cd build/apidoc cd build/apidoc
# This will re-use already existing branches (updated PR). # This will re-use already existing branches (updated PR).
@ -41,9 +41,10 @@ if [ "$TRAVIS_PULL_REQUEST" != false ]; then
elif [ "$TRAVIS_BRANCH" != master ]; then elif [ "$TRAVIS_BRANCH" != master ]; then
# Use merge-base of master in branch name, to keep different branches with # Use merge-base of master in branch name, to keep different branches with
# the same name apart. # the same name apart.
BRANCH=$TRAVIS_BRANCH-$(cd ${REPO_DIR} \ # shellcheck disable=SC2015
BRANCH="$TRAVIS_BRANCH-$(cd "$REPO_DIR" \
&& git fetch --unshallow origin master \ && git fetch --unshallow origin master \
&& git rev-parse --short $(git merge-base HEAD FETCH_HEAD || true) || true) && git rev-parse --short "$(git merge-base HEAD FETCH_HEAD || true)" || true)"
else else
BRANCH="gh-pages" BRANCH="gh-pages"
fi fi
@ -69,7 +70,7 @@ fi
COMMIT_MSG="Update docs for $AWESOME_VERSION via Travis COMMIT_MSG="Update docs for $AWESOME_VERSION via Travis
Last commit message: Last commit message:
$(cd $REPO_DIR && git log -1 --pretty=format:%s) $(cd "$REPO_DIR" && git log -1 --pretty=format:%s)
Build URL: https://travis-ci.org/awesomeWM/awesome/builds/${TRAVIS_BUILD_ID}" Build URL: https://travis-ci.org/awesomeWM/awesome/builds/${TRAVIS_BUILD_ID}"
git commit -m "[relevant] $COMMIT_MSG" git commit -m "[relevant] $COMMIT_MSG"
@ -107,13 +108,14 @@ COMPARE_LINKS="$COMPARE_LINKS\nRelevant changes: https://github.com/awesomeWM/ap
if [ "$BRANCH" != "gh-pages" ]; then if [ "$BRANCH" != "gh-pages" ]; then
COMPARE_LINKS="$COMPARE_LINKS\nComparison against master (gh-pages): https://github.com/awesomeWM/apidoc/compare/gh-pages...${NEW_REV}" COMPARE_LINKS="$COMPARE_LINKS\nComparison against master (gh-pages): https://github.com/awesomeWM/apidoc/compare/gh-pages...${NEW_REV}"
fi fi
# shellcheck disable=SC2028
echo "Compare links:\n$COMPARE_LINKS" echo "Compare links:\n$COMPARE_LINKS"
# Post a comment to the PR. # Post a comment to the PR.
if [ "$TRAVIS_PULL_REQUEST" != false ]; then if [ "$TRAVIS_PULL_REQUEST" != false ]; then
curl -H "Authorization: token $GH_TOKEN" \ curl -H "Authorization: token $GH_TOKEN" \
-d "{\"body\": \"Documentation has been updated for this PR:\n$COMPARE_LINKS\"}" \ -d "{\"body\": \"Documentation has been updated for this PR:\n$COMPARE_LINKS\"}" \
https://api.github.com/repos/awesomeWM/awesome/issues/${TRAVIS_PULL_REQUEST}/comments "https://api.github.com/repos/awesomeWM/awesome/issues/${TRAVIS_PULL_REQUEST}/comments"
fi fi
# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 # vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80