[tor-commits] [sbws/master] fixup! fix: CI: Test all supported python versions

[juga at torproject.org]

commit 8716c1d877e757a8aa3b9914926def54c1124c01
Author: juga0 <juga at riseup.net>
Date:   Thu Feb 6 08:20:09 2020 +0000

    fixup! fix: CI: Test all supported python versions
---
 .travis.yml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 13b3c3a..fd9f30a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,12 +41,12 @@ 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/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
           packages:
             - tor
-      env: TOR="0.4.0-nightly"
-    ## The current stable release is 0.4.1
+      env: TOR="0.4.1-nightly"
+    ## The current stable release is 0.4.2
     - addons:
         apt:
           sources:
@@ -55,15 +55,6 @@ matrix:
           packages:
             - tor
       env: TOR="stable-release"
-    ## 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/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
-          packages:
-            - tor
-      env: TOR="0.4.1-nightly"
     - addons:
         apt:
           sources:
@@ -72,6 +63,8 @@ matrix:
           packages:
             - tor
       env: TOR="0.4.2-nightly"
+    # 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