This commit is contained in:
Erica Portnoy 2018-10-30 17:28:45 -07:00
parent 5e9a5e4daa
commit 700c5f2774

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 master --strategy=recursive --strategy-option=theirs --no-edit
- git pull origin warnings-as-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'
@ -161,10 +161,3 @@ after_success: '[ "$TOXENV" == "cover" ] && codecov'
notifications:
email: false
irc:
channels:
- secure: "SGWZl3ownKx9xKVV2VnGt7DqkTmutJ89oJV9tjKhSs84kLijU6EYdPnllqISpfHMTxXflNZuxtGo0wTDYHXBuZL47w1O32W6nzuXdra5zC+i4sYQwYULUsyfOv9gJX8zWAULiK0Z3r0oho45U+FR5ZN6TPCidi8/eGU+EEPwaAw="
on_cancel: never
on_success: never
on_failure: always
use_notice: true