diff options
| author | Brad Warren <bmw@eff.org> | 2019-01-25 20:19:39 +0300 |
|---|---|---|
| committer | Brad Warren <bmw@eff.org> | 2019-01-25 20:19:39 +0300 |
| commit | 22a4be824bd74d1450bf6af5a77b158a92739a38 (patch) | |
| tree | e05992a51cfcd084a3cdc928489171606d56518e | |
| parent | 7277c8b0cb8e617ffa5ae36eb5961127dcc8d516 (diff) | |
right branch and quiettest-everything-0.30.x-update-setuptools
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 5af8908c0..445ad3864 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.30.x-update-setuptools --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 before_script: @@ -172,10 +172,3 @@ after_success: '[ "$TOXENV" == "py27-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 |