diff options
| author | Brad Warren <bmw@eff.org> | 2018-06-13 19:45:42 +0300 |
|---|---|---|
| committer | Brad Warren <bmw@eff.org> | 2018-06-13 19:45:42 +0300 |
| commit | d6a587bb15717663a57fee9066488a3af9bc2063 (patch) | |
| tree | 0a23415f85559f935171f861316be7f12edf9efd | |
| parent | 0cee44f5903734d6858642e328221c31ac4928b4 (diff) | |
test 0.25.x quietlytest-everything-0.25.1
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 240567975..d125e6810 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.25.x --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 == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas && brew upgrade python python3 && brew link python)' @@ -149,10 +149,3 @@ after_success: '[ "$TOXENV" == "cover" ] && coveralls' notifications: email: false - irc: - channels: - - secure: "SGWZl3ownKx9xKVV2VnGt7DqkTmutJ89oJV9tjKhSs84kLijU6EYdPnllqISpfHMTxXflNZuxtGo0wTDYHXBuZL47w1O32W6nzuXdra5zC+i4sYQwYULUsyfOv9gJX8zWAULiK0Z3r0oho45U+FR5ZN6TPCidi8/eGU+EEPwaAw=" - on_cancel: never - on_success: never - on_failure: always - use_notice: true |