[tor-commits] [chutney/master] Travis: switch to tor master by default
teor at torproject.org
teor at torproject.org
Mon Jun 10 09:59:36 UTC 2019
commit fb6ad9c8c8a50d1c21cf733d671ad8fcefde2f07
Author: teor <teor at torproject.org>
Date: Mon Apr 15 14:56:18 2019 +1000
Travis: switch to tor master by default
---
.travis.yml | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 6db6687..2f11021 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,8 @@ os:
## We also use macOS for some networks
matrix:
- # include creates Linux, python 2.7, tor stable builds by default
+ # include creates Linux, python 2.7, tor master builds by default
+ # we use tor master to catch tor issues before stable releases
# the key(s) in each item override these defaults
include:
## Test different network flavours
@@ -68,36 +69,36 @@ matrix:
- shellcheck
- tor
env: TOR="0.3.4-nightly"
- ## The current stable release is listed at the end of the file, because
- ## it is the default for other build variants
+ ## The current stable release is 0.3.5, so we don't have a separate
+ ## 0.3.5-stable job
- addons:
apt:
sources:
- - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.3.5.x-xenial main'
+ - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main'
key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
packages:
- shellcheck
- tor
- env: TOR="0.3.5-nightly"
- ## The experimental deb line needs to be updated when 0.4.0 becomes stable
+ env: TOR="stable-release"
- addons:
apt:
sources:
- - sourceline: 'deb https://deb.torproject.org/torproject.org tor-experimental-0.4.0.x-xenial main'
+ - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.3.5.x-xenial main'
key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
packages:
- shellcheck
- tor
- env: TOR="0.4.0-nightly"
+ env: TOR="0.3.5-nightly"
+ ## The experimental deb line needs to be updated when 0.4.0 becomes stable
- addons:
apt:
sources:
- - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-master-xenial main'
+ - sourceline: 'deb https://deb.torproject.org/torproject.org tor-experimental-0.4.0.x-xenial main'
key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
packages:
- shellcheck
- tor
- env: TOR="master-nightly"
+ env: TOR="0.4.0-nightly"
## Test all supported python releases
## Pre-installed in Travis xenial:
@@ -158,16 +159,14 @@ dist: xenial
## We use the basic-min network by default, to reduce load and increase
## reliability
env:
- - TOR="stable-release" NETWORK_FLAVOUR="basic-min"
+ - TOR="master-nightly" NETWORK_FLAVOUR="basic-min"
## Download our dependencies
addons:
## (Linux only)
apt:
sources:
- ## 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'
+ - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-master-xenial main'
key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
packages:
- shellcheck
More information about the tor-commits
mailing list