March 2019 - tor-commits - lists.torproject.org

[chutney/master] Travis: test more python versions
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 27901cf3c2ae0ae967f21495040f553496675ec2 Author: teor <teor(a)torproject.org> Date: Tue Mar 12 13:56:13 2019 +1000 Travis: test more python versions --- .travis.yml | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 829107a..93fbfdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,18 +74,40 @@ matrix: - tor env: TOR="master-nightly" ## Test all supported python releases + ## Pre-installed in Travis xenial: + ## https://docs.travis-ci.com/user/reference/xenial/#python-support + ## End of Life: 1 January 2020 + ## https://www.python.org/dev/peps/pep-0373/#id2 - python: "2.7" + ## Final Release: 17 March 2019 + ## https://www.python.org/dev/peps/pep-0429/#release-schedule - python: "3.4" + ## Final Release: 17 March 2019 + ## https://www.python.org/dev/peps/pep-0478/#id4 - python: "3.5" + ## End of Life: December 2021 + ## https://www.python.org/dev/peps/pep-0494/#lifespan - python: "3.6" - ## TODO: check if Travis Xenial supports these versions - #- python: "3.7" - #- python: "3.8-dev" + ## End of Life: June 2023 + ## https://www.python.org/dev/peps/pep-0537/#lifespan + - python: "3.7" + ## Stable: 20 October 2019 + ## (Switch from 3.8-dev to 3.8, and check for 3.9-dev) + ## End of Life: October2024 + ## https://www.python.org/dev/peps/pep-0569/#lifespan + - python: "3.8-dev" - python: "nightly" # PyPy versions - ## TODO: check if Travis Xenial supports these versions + ## End of Life: "forever" + ## http://doc.pypy.org/en/latest/faq.html#how-long-will-pypy-support-python2 + ## But chutney can decide not to support python 2 after 1 Jan 2020. + ## Travis Xenial does not support pypy2.7 #- python: "pypy2.7" + ## PyPy does not have documented end of life dates - python: "pypy3.5" + ## PyPy 3.6 is currently in alpha + ## Travis Xenial does not support pypy3.6-dev yet? + #- python: "pypy3.6-dev" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have

1 0

[chutney/master] Travis: also test chutney works with tor 0.3.4 and 0.4.0
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit b4df7a1b23cb6dbaaebea362c83ecd504251f8e8 Author: teor <teor(a)torproject.org> Date: Tue Mar 12 13:45:30 2019 +1000 Travis: also test chutney works with tor 0.3.4 and 0.4.0 --- .travis.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f78a387..829107a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: language: c python: env: TOR="stable-release" - ## Test tor lts, stable, alpha, and nightly + ## Test all supported and available tor versions on Linux ## Standard dpkg configs fall back to stable when newer ## repositories are removed. But we want to fail, so we notice and ## update the repositories. @@ -41,11 +41,30 @@ matrix: - addons: apt: sources: + - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.3.4.x-xenial main' + key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' + packages: + - 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 + - addons: + apt: + sources: - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.3.5.x-xenial main' key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor 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-experimental-0.4.0.x-xenial main' + key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' + packages: + - tor + env: TOR="0.4.0-nightly" - addons: apt: sources:

1 0

[chutney/master] Travis: explain what happens when deb.tpo repositories fail
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 067daf70ae39a7e78f4007dfd21908bf6b94f315 Author: teor <teor(a)torproject.org> Date: Tue Mar 12 14:16:09 2019 +1000 Travis: explain what happens when deb.tpo repositories fail --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93fbfdc..3f8b938 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,9 @@ matrix: python: env: TOR="stable-release" ## Test all supported and available tor versions on Linux - ## Standard dpkg configs fall back to stable when newer - ## repositories are removed. But we want to fail, so we notice and - ## update the repositories. - ## TODO: check what happens when they fall back to 0.2.7 in xenial main + ## If the deb.torproject.org repositories are removed, we will fall back to + ## Ubuntu security's tor version (currently 0.2.9.14). We might want to + ## automatically fail the job if we can't get a newer tor, see #29741. ## The current tor versions in Ubuntu are on this page: ## https://packages.ubuntu.com/search?keywords=tor&searchon=names&exact=1 - addons:

1 0

[chutney/master] Travis: update tor version deb lines
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit d97165284ee2cc98182ca052be0c6f536e58e858 Author: teor <teor(a)torproject.org> Date: Tue Mar 12 13:04:57 2019 +1000 Travis: update tor version deb lines Also: * rename tor versions to "(version)-(status)". * stop allowing failures: chutney/tor work better now --- .travis.yml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f293a3..c8981ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,18 @@ matrix: ## Test macOS with its default python version, and work around an issue ## with language: python on Travis macOS ## We get the tor version in the homebrew cache on the macOS image + ## The current tor version in homebrew is on this page: + ## https://formulae.brew.sh/formula/tor - os: osx language: c - env: TOR_VERSION="cached-stable" + env: TOR_VERSION="stable-release" ## Test tor lts, stable, alpha, and nightly - ## lts and alpha versions need to be manually updated after tor releases - ## (alpha will revert to stable if the version in its URL is not updated) + ## Standard dpkg configs fall back to stable when newer + ## repositories are removed. But we want to fail, so we notice and + ## update the repositories. + ## TODO: check what happens when they fall back to 0.2.7 in xenial main + ## The current tor versions in Ubuntu are on this page: + ## https://packages.ubuntu.com/search?keywords=tor&searchon=names&exact=1 - addons: apt: sources: @@ -24,25 +30,23 @@ matrix: key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor - env: TOR_VERSION="0.2.9" + env: TOR_VERSION="0.2.9-nightly" - addons: apt: sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org 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/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' - - sourceline: 'deb https://deb.torproject.org/torproject.org tor-experimental-0.3.5.x-xenial main' packages: - tor - env: TOR_VERSION="0.3.5" + env: TOR_VERSION="0.3.5-nightly" - addons: apt: sources: - - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main' - key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-master-xenial main' + key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…' packages: - tor - env: TOR_VERSION="nightly" + env: TOR_VERSION="master-nightly" ## Test all supported python releases - python: "2.7" - python: "3.4" @@ -66,9 +70,8 @@ matrix: #fast_finish: true ## These builds fail in Travis at the moment - allow_failures: - - env: TOR_VERSION="0.3.5" - - env: TOR_VERSION="nightly" + #allow_failures: + # - env: TOR_VERSION="master-nightly" ## We don't need sudo. (The "apt:" stanza after this allows us to not need ## sudo; otherwise, we would need it for getting dependencies.) @@ -86,7 +89,7 @@ dist: xenial ## This env var isn't used by the build, but it's useful for debugging ## It should be kept in sync with the Linux tor version below env: - - TOR_VERSION="stable" + - TOR_VERSION="stable-release" ## Download our dependencies addons:

1 0

[chutney/master] Merge remote-tracking branch 'tor-github/pr/8/head'
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 9273887b4dd788d20de6d9cca6aabed25c01eb17 Merge: d07859b 067daf7 Author: teor <teor(a)torproject.org> Date: Wed Mar 13 12:13:20 2019 +1000 Merge remote-tracking branch 'tor-github/pr/8/head' .travis.yml | 199 ++++++++++++++++++++++++++++++++++++++++++++ tools/bootstrap-network.sh | 4 +- tools/test-network.sh | 2 +- torrc_templates/authority.i | 12 +-- 4 files changed, 208 insertions(+), 9 deletions(-)

1 0

[chutney/master] Travis: add a basic Travis CI config
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit a427bc9b8cdabfea260742afced03e17f7a2f822 Author: teor <teor(a)torproject.org> Date: Mon Oct 22 12:02:06 2018 +1000 Travis: add a basic Travis CI config Part of 27912. --- .travis.yml | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..90236c6 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,105 @@ +language: python + +python: + - "2.7" + +os: + - linux + ## Python versions aren't availabe on macOS Travis + #- osx + +## The build matrix in the following stanza expands into builds for each +## OS and python version. +## Placeholder +#env: +# global: +# - +# matrix: +# - + +## Add extra builds +## Placeholder +#matrix: +# include: +# - env: + + ## Uncomment to allow the build to report success (with non-required + ## sub-builds continuing to run) if all required sub-builds have + ## succeeded. This is somewhat buggy currently: it can cause + ## duplicate notifications and prematurely report success if a + ## single sub-build has succeeded. See + ## https://github.com/travis-ci/travis-ci/issues/1696 + #fast_finish: true + + ## Careful! We use global envs, which makes it hard to exclude or + ## allow failures by env: + ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… + #exclude: + ## Placeholder + #- python: "3.6" + # os: linux + +## We don't need sudo. (The "apt:" stanza after this allows us to not need +## sudo; otherwise, we would need it for getting dependencies.) +sudo: false + +## (Linux only) Use the latest Linux image (Ubuntu Trusty) +dist: trusty + +## (Linux only) Download our dependencies +addons: + 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' + key_url: 'http://ha.pool.sks-keyservers.net/pks/lookup?search=0xA3C4F0F979CAA22CDBA8F…' + packages: + ## Required dependencies + - tor + ## Is this necessary for a once-off build? + #- deb.torproject.org-keyring + +## (OSX only) Use the default OSX image +## See https://docs.travis-ci.com/user/reference/osx#os-x-version +## Default is Xcode 9.4 on macOS 10.13 as of August 2018 +#osx_image: xcode9.4 + +before_install: + ## Placeholder + - + +install: + ## Placeholder + - + ## + ## Finally, list installed package versions + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi + - python --version + - tor --version + +script: + - tools/test-network.sh + +after_failure: + ## Re-run chutney in debug mode + ## TODO: improve debug mode + - tools/test-network.sh --debug + +after_success: + ## Placeholder + - + +notifications: + irc: + channels: + - "irc.oftc.net#tor-ci" + template: + - "%{repository} %{branch} %{commit} - %{author}: %{commit_subject}" + - "Build #%{build_number} %{result}. Details: %{build_url}" + on_success: change + on_failure: change + email: + on_success: never + on_failure: change

1 0

[chutney/master] Travis: add a macOS build with the default python version
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit a84860240bee33e1816aae7d34f575380cfe076e Author: teor <teor(a)torproject.org> Date: Thu Oct 25 09:17:59 2018 +1000 Travis: add a macOS build with the default python version --- .travis.yml | 62 ++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2341b36..f755cf0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,12 @@ language: python -python: - ## Test against all supported python releases - - "2.7" - - "3.4" - - "3.5" - - "3.6" - ## Travis Trusty doesn't support these versions - #- "3.7" - #- "3.8-dev" - - "nightly" - # PyPy versions - ## Travis Trusty doesn't support these versions - #- "pypy2.7" - - "pypy3.5" +## Use the default python version on macOS +#python: os: - linux - ## Python versions aren't availabe on macOS Travis - #- osx + ## We can't add macOS here, because language: python isn't supported by + ## macOS Travis. So we add macOS in matrix: include: ## The build matrix in the following stanza expands into builds for each ## OS and python version. @@ -29,11 +17,25 @@ os: # matrix: # - -## Add extra builds -## Placeholder -#matrix: -# include: -# - env: +matrix: + include: + ## Test macOS with its default python version, and work around an issue + ## with language: python on Travis macOS + - os: osx + language: c + ## Test Linux against all supported python releases + - python: "2.7" + - python: "3.4" + - python: "3.5" + - python: "3.6" + ## Travis Trusty doesn't support these versions + #- python: "3.7" + #- python: "3.8-dev" + - python: "nightly" + # PyPy versions + ## Travis Trusty doesn't support these versions + #- python: "pypy2.7" + - python: "pypy3.5" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -58,8 +60,14 @@ sudo: false ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty -## (Linux only) Download our dependencies +## (OSX only) Use the default OSX image +## See https://docs.travis-ci.com/user/reference/osx#os-x-version +## Default is Xcode 9.4 on macOS 10.13 as of August 2018 +#osx_image: xcode9.4 + +## Download our dependencies addons: + ## (Linux only) apt: sources: ## Trusty has Tor 0.2.4, so we need a newer version of Tor from the @@ -71,11 +79,11 @@ addons: - tor ## Is this necessary for a once-off build? #- deb.torproject.org-keyring - -## (OSX only) Use the default OSX image -## See https://docs.travis-ci.com/user/reference/osx#os-x-version -## Default is Xcode 9.4 on macOS 10.13 as of August 2018 -#osx_image: xcode9.4 + ## (macOS only) + homebrew: + packages: + ## Required dependencies + - tor before_install: ## Placeholder

1 0

[chutney/master] Travis: add a tor 0.3.5 and a tor nightly build
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit fa02347d1b7e723c8bfcf4cdc77c112f80cbbef4 Author: teor <teor(a)torproject.org> Date: Thu Oct 25 10:45:20 2018 +1000 Travis: add a tor 0.3.5 and a tor nightly build --- .travis.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f755cf0..0c5be6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,12 +18,30 @@ os: # - matrix: + # include creates Linux, python 2.7, tor stable builds by default include: ## Test macOS with its default python version, and work around an issue ## with language: python on Travis macOS - os: osx language: c - ## Test Linux against all supported python releases + ## Test tor 0.3.5 and tor nightly + - addons: + apt: + sources: + - sourceline: 'deb https://deb.torproject.org/torproject.org trusty main' + key_url: 'http://ha.pool.sks-keyservers.net/pks/lookup?search=0xA3C4F0F979CAA22CDBA8F…' + - sourceline: 'deb https://deb.torproject.org/torproject.org tor-experimental-0.3.5.x-trusty main' + packages: + - tor + - addons: + apt: + sources: + - sourceline: 'deb https://deb.torproject.org/torproject.org trusty main' + key_url: 'http://ha.pool.sks-keyservers.net/pks/lookup?search=0xA3C4F0F979CAA22CDBA8F…' + - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-master-trusty main' + packages: + - tor + ## Test all supported python releases - python: "2.7" - python: "3.4" - python: "3.5"

1 0

[chutney/master] Travis: list the contents of net/nodes and cat directory documents on failure
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 696922f50bd2969a86ed34af7c3fd7b4f051d0f6 Author: teor <teor(a)torproject.org> Date: Thu Oct 25 11:03:21 2018 +1000 Travis: list the contents of net/nodes and cat directory documents on failure --- .travis.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0c5be6f..76ed96b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -121,6 +121,21 @@ script: - tools/test-network.sh after_failure: + ## List the contents of net/nodes + - ls -lR net/nodes/ + ## Dump the important directory documents + #- cat net/nodes/000a*/cached-certs + - cat net/nodes/000a*/cached-consensus + - cat net/nodes/000a*/cached-descriptors* + #- cat net/nodes/000a*/cached-extrainfo* + - cat net/nodes/000a*/cached-microdesc-consensus + - cat net/nodes/000a*/cached-microdescs* + #- cat net/nodes/000a*/key-pinning-journal + #- cat net/nodes/000a*/router-stability + #- cat net/nodes/00*a*/sr-state + #- cat net/nodes/00*a*/state + - for f in net/nodes/00*a*/v3-status-votes ; do echo "$f"; cat "$f"; done + - for f in net/nodes/00*a*/unparseable-descs/* ; do echo "$f"; cat "$f"; done ## Re-run chutney in debug mode ## TODO: improve debug mode - tools/test-network.sh --debug

1 0

[chutney/master] Travis: try all supported python versions
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 68e681ba0fd749de874e4b1fabe5a0ff488e11ab Author: teor <teor(a)torproject.org> Date: Thu Oct 25 08:58:12 2018 +1000 Travis: try all supported python versions --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index 90236c6..2341b36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,19 @@ language: python python: + ## Test against all supported python releases - "2.7" + - "3.4" + - "3.5" + - "3.6" + ## Travis Trusty doesn't support these versions + #- "3.7" + #- "3.8-dev" + - "nightly" + # PyPy versions + ## Travis Trusty doesn't support these versions + #- "pypy2.7" + - "pypy3.5" os: - linux

1 0