travis: use 'git fetch' to deepen, not 'git pull'

Travis builds of branches (i.e. pull-requests) were testing the wrong
thing, because the 'git pull' was causing current trunk to be
auto-merged. At least that's what seemed to break
https://travis-ci.org/tahoe-lafs/tahoe-lafs/jobs/81517826 : it hung
forever waiting for a commit message to be entered.

Also add "sudo: false" to use travis containers (faster) instead of new
VMs. We only use pip to install dependencies, not apt, so we don't need
root.
This commit is contained in:
Brian Warner 2015-09-22 12:10:15 -07:00
parent a4dfc31a19
commit 759e87b24b

View File

@ -1,3 +1,4 @@
sudo: false
language: python language: python
python: python:
- "2.7" - "2.7"
@ -7,7 +8,7 @@ before_install:
- sh -c set - sh -c set
- git config --global user.email "travis-tahoe@tahoe-lafs.org" - git config --global user.email "travis-tahoe@tahoe-lafs.org"
- git config --global user.name "Travis Tahoe" - git config --global user.name "Travis Tahoe"
- git pull --depth=1000 - git fetch --depth=1000
- python misc/build_helpers/show-tool-versions.py - python misc/build_helpers/show-tool-versions.py
install: install:
- pip install 'coveralls==0.4.2' - pip install 'coveralls==0.4.2'