diff --git a/.travis.yml b/.travis.yml index bfa6936bf..bbf495ea9 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 warnings-as-errors --strategy=recursive --strategy-option=theirs --no-edit + - git pull origin warnings-are-errors --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'