From d08035f8f15b7ddd89a318ea34bc386a9e33a8ea Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 30 Dec 2015 16:15:36 +0100 Subject: [PATCH] [docs] Fix up build, really --- .ci/deploy-docs.sh | 9 ++++----- .travis.yml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.ci/deploy-docs.sh b/.ci/deploy-docs.sh index 0395597df..73f653092 100755 --- a/.ci/deploy-docs.sh +++ b/.ci/deploy-docs.sh @@ -1,13 +1,12 @@ +#!/bin/bash -set -o errexit -o nounset set -x +set -o errexit -o nounset -if test "$TRAVIS_OS_NAME" != "linux" -o "$CC" != "gcc" -o "$TRAVIS_SECURE_ENV_VARS" != "true"; then exit; fi - -BRANCH="$(TRAVIS_BRANCH)" +BRANCH="$TRAVIS_BRANCH" if test "x$BRANCH" != xmaster; then exit; fi -TAG="$(git describe --exact-match --match "[0-9]*" HEAD 2>/dev/null)" +TAG="$(git describe --exact-match --match "[0-9]*" HEAD 2>/dev/null || true)" DOCSDIR=build-docs REVISION=$(git rev-parse --short HEAD) diff --git a/.travis.yml b/.travis.yml index 7c155a716..886c210e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ script: - make check - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CC" == "gcc" ]; then rm -f src/.libs/NONE.gcov; touch src/NONE; coveralls -e docs; fi after_success: - - bash .ci/deploy-docs.sh + - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CC" == "gcc" -a "$TRAVIS_SECURE_ENV_VARS" == "true" ]; then bash .ci/deploy-docs.sh; fi notifications: irc: "irc.freenode.org#harfbuzz" email: harfbuzz@lists.freedesktop.org