From 759e87b24bec548677e8b36015341472fea0e858 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Tue, 22 Sep 2015 12:10:15 -0700 Subject: [PATCH] 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. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 484e5026..30e946b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: false language: python python: - "2.7" @@ -7,7 +8,7 @@ before_install: - sh -c set - git config --global user.email "travis-tahoe@tahoe-lafs.org" - git config --global user.name "Travis Tahoe" - - git pull --depth=1000 + - git fetch --depth=1000 - python misc/build_helpers/show-tool-versions.py install: - pip install 'coveralls==0.4.2' -- 2.37.2