Skip to content

Commit

Permalink
Merge pull request #1295 from blueyed/travis-fix-test-each-commit
Browse files Browse the repository at this point in the history
Travis: fix testing each commit
  • Loading branch information
blueyed authored Dec 25, 2016
2 parents 3f9da42 + 69915fb commit 44698ed
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,11 @@ install:
# Functions for custom Travis folds.
- |
travis_fold_start() {
echo -n "travis_"
echo "fold:start:$1"
travis_fold start "$1"
travis_fold_current="$1"
}
travis_fold_end() {
echo -n "travis_"
echo "fold:end:$travis_fold_current"
travis_fold end "$travis_fold_current"
}
travis_run_in_fold() {
travis_fold_start "$1"
Expand Down Expand Up @@ -181,12 +179,14 @@ script:
set -ev
if [ "$TEST_PREV_COMMITS" = 1 ] && ! [ "$TRAVIS_PULL_REQUEST" = false ]; then
# Check each commit separately (to make git-bisect less annoying).
echo "Testing previous commits based on TRAVIS_COMMIT_RANGE=$TRAVIS_COMMIT_RANGE"
rev_list="$(git rev-list --bisect-all $TRAVIS_COMMIT_RANGE)"
# Fix Travis' commit range (https://github.com/travis-ci/travis-ci/issues/4596).
commit_range="${TRAVIS_COMMIT_RANGE/.../..}"
echo "Testing previous commits ($commit_range)"
rev_list="$(git rev-list --bisect-all $commit_range)"
echo "rev-list: $rev_list"
commits="$(echo $rev_list | grep -v 'dist=0' | cut -d\ -f 1)"
echo "Testing commits: $commits"
n="$(echo commits | wc -l)"
commits="$(echo "$rev_list" | grep -v 'dist=0' | cut -d\ -f 1)"
n="$(echo "$commits" | wc -l)"
echo "Testing $n commits: $commits"
i=0
failed=
for commit in $commits; do
Expand Down
4 changes: 2 additions & 2 deletions build-utils/travis-apidoc.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash
#
# Process (API) docs after a successful build on Travis (via ../.travis.yml).
#
Expand Down Expand Up @@ -76,7 +76,7 @@ COMMIT_MSG="Update docs for $AWESOME_VERSION via Travis
Last commit message:
$LAST_COMMIT_MSG
Commits: https://github.com/awesomeWM/awesome/compare/${TRAVIS_COMMIT_RANGE}
Commits: https://github.com/awesomeWM/awesome/compare/${TRAVIS_COMMIT_RANGE/.../..}
Build URL: https://travis-ci.org/awesomeWM/awesome/builds/${TRAVIS_BUILD_ID}"
git commit -m "[relevant] $COMMIT_MSG"

Expand Down

0 comments on commit 44698ed

Please sign in to comment.