diff options
author | Brad Warren <bmw@eff.org> | 2019-01-04 20:41:30 +0300 |
---|---|---|
committer | Brad Warren <bmw@eff.org> | 2019-01-04 20:41:30 +0300 |
commit | 6e9dd28933fb39723dd6aec576da2cb1f1649757 (patch) | |
tree | 1dfcc4aa1d329bed15cf9eab7ae11e28a44dac38 /.travis.yml | |
parent | 000fc0b751e140f6055c524f012d932c62a929e6 (diff) |
setup teststest-fix-integration
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 1fb618b0f..92399cbf0 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 fix-integration --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" == "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 |