aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorGravatar Jason Gross <jgross@mit.edu>2018-10-23 20:01:15 -0400
committerGravatar Jason Gross <jasongross9@gmail.com>2018-10-25 13:02:36 -0400
commit8e029978760d6de340d7144f20b1a98a1b291058 (patch)
tree5e9fb956a2023424f867b2ef0cf850037e56fdbb /etc
parent071ac04c39f1a0355b036db045175c12cdfb301f (diff)
[travis] Always display the diff, but don't display _CoqProject
Because remove_autogenerated.sh updates _CoqProject, and we don't want to see the churn from that.
Diffstat (limited to 'etc')
-rwxr-xr-xetc/ci/travis.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/ci/travis.sh b/etc/ci/travis.sh
index 981dcd7e1..8942d1db7 100755
--- a/etc/ci/travis.sh
+++ b/etc/ci/travis.sh
@@ -15,8 +15,9 @@ python "./etc/coq-scripts/timing/make-one-time-file.py" "time-of-build.log" "tim
rm -f "${CUR_ARCHIVE}"
tar -czf "${CUR_ARCHIVE}" time-of-build.log src bbv coqprime || exit $?
-if [ ! -f finished.ok ]; then
- git diff
-fi
+git update-index --assume-unchanged _CoqProject
+git status
+git diff
+
cat time-of-build-pretty.log
make "$@" -j2 TIMED=1 || exit $?