commit 157aaba4e50d266dee7d8dedf8337074f9c1138e Author: teor teor@torproject.org Date: Thu Feb 6 08:54:36 2020 +1000

Travis: Update tor versions

* remove unsupported 0.2.9 and 0.4.0 * stable is now 0.4.2

Closes ticket 33163. --- .travis.yml | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml index 46d3866..05a688f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,17 +72,6 @@ matrix: ## The current tor versions in Ubuntu are on this page: ## https://packages.ubuntu.com/search?keywords=tor&searchon=names&exact... ## - ## We run 0.2.9 on Xenial, because Bionic has an OpenSSL version mismatch - - dist: xenial - addons: - apt: - sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.2.9.x-xenial main' - key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E88...' - packages: - - shellcheck - - tor - env: TOR="0.2.9-nightly" NETWORK_FLAVOUR="basic-min" - addons: apt: sources: @@ -95,13 +84,13 @@ matrix: - addons: apt: sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.4.0.x-bionic main' + - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.4.1.x-bionic main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E88...' packages: - shellcheck - tor - env: TOR="0.4.0-nightly" NETWORK_FLAVOUR="basic-min" - ## The current stable release is 0.4.1 + env: TOR="0.4.1-nightly" NETWORK_FLAVOUR="basic-min" + # The current stable release is 0.4.2 - addons: apt: sources: @@ -111,16 +100,6 @@ matrix: - shellcheck - tor env: TOR="stable-release" NETWORK_FLAVOUR="basic-min" - ## We also have 0.4.1 and 0.4.2 nightlies - - addons: - apt: - sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.4.1.x-bionic main' - key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E88...' - packages: - - shellcheck - - tor - env: TOR="0.4.1-nightly" NETWORK_FLAVOUR="basic-min" - addons: apt: sources: @@ -130,6 +109,8 @@ matrix: - shellcheck - tor env: TOR="0.4.2-nightly" NETWORK_FLAVOUR="basic-min" + # We test nightly master by default, in our network tests. So we don't need + # a nightly master test here.

## Test all supported python releases