From 70c667689eedccbe5ee729630cc2950cd8510daf Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Wed, 5 Dec 2018 15:39:20 -0800 Subject: [PATCH] use point release branch --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1fb618b0f..0405ddd56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: # in a Travis cron, but with a different set of tests than master has # in .travis.yml. - cp .travis.yml /tmp/travis.yml - - git pull origin master --strategy=recursive --strategy-option=theirs --no-edit + - git pull origin 0.29.x --strategy=recursive --strategy-option=theirs --no-edit - if ! git diff .travis.yml /tmp/travis.yml ; then echo "Please merge master into test-everything"; exit 1; fi - '[ "$TRAVIS_OS_NAME" != osx ] || tests/travis-macos-setup.sh'