commit 65ca1288d123565b248d6849131f98d02f2c3e9b Author: teor teor@torproject.org Date: Fri May 24 15:13:52 2019 +1000

Travis: show the correct macOS tor versions

Closes ticket 30820. --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml index e97703f..50719b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,22 +26,22 @@ matrix: ## The latest tor version in homebrew is on this page: ## https://formulae.brew.sh/formula/tor ## The Travis version might be slightly older. - - env: NETWORK_FLAVOUR="bridges-min" - - env: NETWORK_FLAVOUR="hs-v2-min" - - env: NETWORK_FLAVOUR="hs-v3-min" - - env: NETWORK_FLAVOUR="single-onion-v23" - - env: NETWORK_FLAVOUR="bridges+ipv6-min" + - env: TOR="master-nightly" NETWORK_FLAVOUR="bridges-min" + - env: TOR="master-nightly" NETWORK_FLAVOUR="hs-v2-min" + - env: TOR="master-nightly" NETWORK_FLAVOUR="hs-v3-min" + - env: TOR="master-nightly" NETWORK_FLAVOUR="single-onion-v23" + - env: TOR="stable-release" NETWORK_FLAVOUR="bridges+ipv6-min" os: osx language: c python: ## The IPv6 exit test doesn't actually require IPv6, see #30182. ## But we'll keep this test, because it does test IPv6 exit config. - - env: NETWORK_FLAVOUR="ipv6-exit-min" - - env: NETWORK_FLAVOUR="hs-v23-ipv6-md" + - env: TOR="master-nightly" NETWORK_FLAVOUR="ipv6-exit-min" + - env: TOR="stable-release" NETWORK_FLAVOUR="hs-v23-ipv6-md" os: osx language: c python: - - env: NETWORK_FLAVOUR="single-onion-ipv6-md" + - env: TOR="stable-release" NETWORK_FLAVOUR="single-onion-ipv6-md" os: osx language: c python: