Merge branch 'sg/travis-skip-identical-test'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jan 2018 22:32:54 +0000 (14:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jan 2018 22:32:54 +0000 (14:32 -0800)
Avoid repeatedly testing the same tree in TravisCI that have been
tested successfully already.

* sg/travis-skip-identical-test:
travis-ci: record and skip successfully built trees
travis-ci: create the cache directory early in the build process
travis-ci: print the "tip of branch is exactly at tag" message in color

ci/lib-travisci.sh
ci/run-linux32-docker.sh
ci/run-static-analysis.sh
ci/run-tests.sh
ci/run-windows-build.sh
ci/test-documentation.sh
index 348fe3c3c1d304f9887c24e023a90123ad43d0c8..bade716171c60634e959d32b37a6b51e658b5cf2 100755 (executable)
@@ -16,18 +16,67 @@ skip_branch_tip_with_tag () {
        if TAG=$(git describe --exact-match "$TRAVIS_BRANCH" 2>/dev/null) &&
                test "$TAG" != "$TRAVIS_BRANCH"
        then
-               echo "Tip of $TRAVIS_BRANCH is exactly at $TAG"
+               echo "$(tput setaf 2)Tip of $TRAVIS_BRANCH is exactly at $TAG$(tput sgr0)"
                exit 0
        fi
 }
 
+good_trees_file="$HOME/travis-cache/good-trees"
+
+# Save some info about the current commit's tree, so we can skip the build
+# job if we encounter the same tree again and can provide a useful info
+# message.
+save_good_tree () {
+       echo "$(git rev-parse $TRAVIS_COMMIT^{tree}) $TRAVIS_COMMIT $TRAVIS_JOB_NUMBER $TRAVIS_JOB_ID" >>"$good_trees_file"
+       # limit the file size
+       tail -1000 "$good_trees_file" >"$good_trees_file".tmp
+       mv "$good_trees_file".tmp "$good_trees_file"
+}
+
+# Skip the build job if the same tree has already been built and tested
+# successfully before (e.g. because the branch got rebased, changing only
+# the commit messages).
+skip_good_tree () {
+       if ! good_tree_info="$(grep "^$(git rev-parse $TRAVIS_COMMIT^{tree}) " "$good_trees_file")"
+       then
+               # Haven't seen this tree yet, or no cached good trees file yet.
+               # Continue the build job.
+               return
+       fi
+
+       echo "$good_tree_info" | {
+               read tree prev_good_commit prev_good_job_number prev_good_job_id
+
+               if test "$TRAVIS_JOB_ID" = "$prev_good_job_id"
+               then
+                       cat <<-EOF
+                       $(tput setaf 2)Skipping build job for commit $TRAVIS_COMMIT.$(tput sgr0)
+                       This commit has already been built and tested successfully by this build job.
+                       To force a re-build delete the branch's cache and then hit 'Restart job'.
+                       EOF
+               else
+                       cat <<-EOF
+                       $(tput setaf 2)Skipping build job for commit $TRAVIS_COMMIT.$(tput sgr0)
+                       This commit's tree has already been built and tested successfully in build job $prev_good_job_number for commit $prev_good_commit.
+                       The log of that build job is available at https://travis-ci.org/$TRAVIS_REPO_SLUG/jobs/$prev_good_job_id
+                       To force a re-build delete the branch's cache and then hit 'Restart job'.
+                       EOF
+               fi
+       }
+
+       exit 0
+}
+
 # Set 'exit on error' for all CI scripts to let the caller know that
 # something went wrong.
 # Set tracing executed commands, primarily setting environment variables
 # and installing dependencies.
 set -ex
 
+mkdir -p "$HOME/travis-cache"
+
 skip_branch_tip_with_tag
+skip_good_tree
 
 if test -z "$jobname"
 then
index 3a8b2ba42aeb9a5aaba94830a45329bfe871be73..870a41246310963383754289d514d15faf8b839f 100755 (executable)
@@ -22,3 +22,5 @@ docker run \
        --volume "${HOME}/travis-cache:/tmp/travis-cache" \
        daald/ubuntu32:xenial \
        /usr/src/git/ci/run-linux32-build.sh $(id -u $USER)
+
+save_good_tree
index 68dd0f080e88983a1be250ed2e4c9f9d8cf144f2..fe4ee4e06b1e33d3ee1cd9022df06c960dd8d75b 100755 (executable)
@@ -6,3 +6,5 @@
 . ${0%/*}/lib-travisci.sh
 
 make coccicheck
+
+save_good_tree
index f0c743de948d282f3259fcf22b19fd84e15dcf42..eb5ba4058ad0cf34302d37907ebe98dfbfc06d02 100755 (executable)
@@ -5,6 +5,7 @@
 
 . ${0%/*}/lib-travisci.sh
 
-mkdir -p $HOME/travis-cache
 ln -s $HOME/travis-cache/.prove t/.prove
 make --quiet test
+
+save_good_tree
index 86999268a72c3dc1b81383cdcfe41919dd337e15..d99a180e528084a43dff3f640ad3036f4f9dbf07 100755 (executable)
@@ -99,3 +99,5 @@ gfwci "action=log&buildId=$BUILD_ID" | cut -c 30-
 
 # Set exit code for TravisCI
 test "$RESULT" = "success"
+
+save_good_tree
index 7a0a848e83d68152acaa1de50fd7fb5fe9990151..3d62e6c9539b04f1601b92617a514c1a8b63fe56 100755 (executable)
@@ -25,3 +25,5 @@ sed '/^GIT_VERSION = / d' stderr.log
 ! test -s stderr.log
 test -s Documentation/git.html
 grep '<meta name="generator" content="Asciidoctor ' Documentation/git.html
+
+save_good_tree