From cd322d2cae97a7059b4f0df39f6f9030d81182f9 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Tue, 3 Apr 2018 15:26:35 -0700 Subject: [PATCH] test it --- .travis.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6767164c2..db1bc27ea 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 separate-repinned-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 == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas && brew upgrade python python3 && brew link python)' @@ -31,6 +31,14 @@ matrix: env: TOXENV=py27-nginx-oldest BOULDER_INTEGRATION=v2 sudo: required services: docker + - python: "2.7" + env: TOXENV=py27-certbot-oldest BOULDER_INTEGRATION=v1 + sudo: required + services: docker + - python: "2.7" + env: TOXENV=py27-certbot-oldest BOULDER_INTEGRATION=v2 + sudo: required + services: docker - python: "2.7" env: TOXENV=py27_install BOULDER_INTEGRATION=v2 sudo: required @@ -40,7 +48,7 @@ matrix: sudo: required services: docker - python: "2.7" - env: TOXENV='py27-{acme,apache,certbot,dns}-oldest' + env: TOXENV='py27-{acme,apache,dns}-oldest' - sudo: required env: TOXENV=apache_compat services: docker @@ -145,9 +153,3 @@ after_success: '[ "$TOXENV" == "cover" ] && coveralls' notifications: email: false - irc: - channels: - - secure: "SGWZl3ownKx9xKVV2VnGt7DqkTmutJ89oJV9tjKhSs84kLijU6EYdPnllqISpfHMTxXflNZuxtGo0wTDYHXBuZL47w1O32W6nzuXdra5zC+i4sYQwYULUsyfOv9gJX8zWAULiK0Z3r0oho45U+FR5ZN6TPCidi8/eGU+EEPwaAw=" - on_success: never - on_failure: always - use_notice: true