瀏覽代碼

Update travis.sh to full test master each merge

Tianon Gravi 10 年之前
父節點
當前提交
afec27c9a9
共有 1 個文件被更改,包括 5 次插入1 次删除
  1. 5 1
      bashbrew/travis.sh

+ 5 - 1
bashbrew/travis.sh

@@ -17,7 +17,10 @@ HEAD="$(git rev-parse --verify HEAD)"
 git fetch -q "https://github.com/$upstreamRepo.git" "refs/heads/$upstreamBranch"
 UPSTREAM="$(git rev-parse --verify FETCH_HEAD)"
 
-if [ "$(git diff --numstat "$UPSTREAM...$HEAD" -- . | wc -l)" -ne 0 ]; then
+if [ "$TRAVIS_BRANCH" = 'master' -a "$TRAVIS_PULL_REQUEST" = 'false' ]; then
+	# if we're testing master itself, RUN ALL THE THINGS
+	echo >&2 'Testing master -- BUILD ALL THE THINGS!'
+elif [ "$(git diff --numstat "$UPSTREAM...$HEAD" -- . | wc -l)" -ne 0 ]; then
 	# changes in bashbrew/ -- keep "--all" so we test the bashbrew script changes appropriately
 	echo >&2 'Changes in bashbrew/ detected!'
 else
@@ -36,3 +39,4 @@ set -x
 ./bashbrew.sh list "${repos[@]}"
 ./bashbrew.sh build --no-build "${repos[@]}"
 ./bashbrew.sh push --no-push "${repos[@]}"
+# TODO ./bashbrew.sh list "${repos[@]}" | xargs ../test/run.sh