|
@@ -20,7 +20,7 @@ matrix:
|
|
|
- addons:
|
|
|
apt:
|
|
|
sources:
|
|
|
- - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.2.9.x-trusty main'
|
|
|
+ - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.2.9.x-xenial main'
|
|
|
key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
|
|
|
packages:
|
|
|
- tor
|
|
@@ -28,18 +28,18 @@ matrix:
|
|
|
- addons:
|
|
|
apt:
|
|
|
sources:
|
|
|
- - sourceline: 'deb https://deb.torproject.org/torproject.org trusty main'
|
|
|
+ - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main'
|
|
|
key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
|
|
|
- - sourceline: 'deb https://deb.torproject.org/torproject.org tor-experimental-0.3.5.x-trusty main'
|
|
|
+ - sourceline: 'deb https://deb.torproject.org/torproject.org tor-experimental-0.3.5.x-xenial main'
|
|
|
packages:
|
|
|
- tor
|
|
|
env: TOR_VERSION="0.3.5"
|
|
|
- addons:
|
|
|
apt:
|
|
|
sources:
|
|
|
- - sourceline: 'deb https://deb.torproject.org/torproject.org trusty main'
|
|
|
+ - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main'
|
|
|
key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
|
|
|
- - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-master-trusty main'
|
|
|
+ - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-master-xenial main'
|
|
|
packages:
|
|
|
- tor
|
|
|
env: TOR_VERSION="nightly"
|
|
@@ -48,12 +48,12 @@ matrix:
|
|
|
- python: "3.4"
|
|
|
- python: "3.5"
|
|
|
- python: "3.6"
|
|
|
- ## Travis Trusty doesn't support these versions
|
|
|
+ ## TODO: check if Travis Xenial supports these versions
|
|
|
#- python: "3.7"
|
|
|
#- python: "3.8-dev"
|
|
|
- python: "nightly"
|
|
|
# PyPy versions
|
|
|
- ## Travis Trusty doesn't support these versions
|
|
|
+ ## TODO: check if Travis Xenial supports these versions
|
|
|
#- python: "pypy2.7"
|
|
|
- python: "pypy3.5"
|
|
|
|
|
@@ -74,8 +74,9 @@ matrix:
|
|
|
## sudo; otherwise, we would need it for getting dependencies.)
|
|
|
sudo: false
|
|
|
|
|
|
-## (Linux only) Use the latest Linux image (Ubuntu Trusty)
|
|
|
-dist: trusty
|
|
|
+## (Linux only) Use the Ubuntu Xenial Linux Image
|
|
|
+## deb.torproject.org doesn't support Trusty any more
|
|
|
+dist: xenial
|
|
|
|
|
|
## (OSX only) Use the default OSX image
|
|
|
## See https://docs.travis-ci.com/user/reference/osx#os-x-version
|
|
@@ -92,9 +93,9 @@ addons:
|
|
|
## (Linux only)
|
|
|
apt:
|
|
|
sources:
|
|
|
- ## Trusty has Tor 0.2.4, so we need a newer version of Tor from the
|
|
|
- ## torproject repositories, and the torproject key from the keyservers
|
|
|
- - sourceline: 'deb https://deb.torproject.org/torproject.org trusty main'
|
|
|
+ ## Xenial has Tor 0.2.7, so we need a newer version of Tor from the
|
|
|
+ ## torproject repositories, and the torproject key from deb.tpo
|
|
|
+ - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main'
|
|
|
key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
|
|
|
packages:
|
|
|
- tor
|