This commit is contained in:
Erica Portnoy 2018-10-30 17:33:23 -07:00
parent 700c5f2774
commit b94f658c20

View file

@ -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'