January 2018 - tor-commits - lists.torproject.org

[tor/release-0.2.5] Work around Travis CI ptrace regression
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents LeakSanitizer on clang from working properly. Set "sudo: required" to force non-container builds for clang and work around this. --- .travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59b32dbe4..60f82af3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: c -compiler: - - gcc - - clang +## Comment out the compiler list for now to allow an explicit build +## matrix. +# compiler: +# - gcc +# - clang notifications: irc: @@ -28,6 +30,10 @@ dist: trusty ## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo; ## otherwise, we would need it for getting dependencies.) +## +## We override this in the explicit build matrix to work around a +## Travis CI environment regression +## https://github.com/travis-ci/travis-ci/issues/9033 sudo: false ## (Linux only) Download our dependencies @@ -61,6 +67,18 @@ matrix: ## entire job early and call the whole thing a failure. fast_finish: true + ## Create explicit matrix entries to work around a Travis CI + ## environment issue. Missing keys inherit from the first list + ## entry under that key outside the "include" clause. + include: + - compiler: gcc + ## The "sudo: required" forces non-containerized builds, working + ## around a Travis CI environment issue: clang LeakAnalyzer fails + ## because it requires ptrace and the containerized environment no + ## longer allows ptrace. + - compiler: clang + sudo: required + before_install: ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi

1 0

[tor/master] Merge remote-tracking branch 'tlyu-github/travis-workaround-master'
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 63e549a6b4b57b2d70b83d14418bcad1f86136ce Merge: 9652c65fa 3bf9174fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:18:55 2018 -0500 Merge remote-tracking branch 'tlyu-github/travis-workaround-master' .travis.yml | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit e2aacf100f5112aa8d0564b9f90ce38048ee0a82 Merge: 44388757c 483a59ec2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:18:29 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-)

1 0

[tor/master] Work around Travis CI ptrace regression
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents LeakSanitizer on clang from working properly. Set "sudo: required" to force non-container builds for clang and work around this. --- .travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59b32dbe4..60f82af3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: c -compiler: - - gcc - - clang +## Comment out the compiler list for now to allow an explicit build +## matrix. +# compiler: +# - gcc +# - clang notifications: irc: @@ -28,6 +30,10 @@ dist: trusty ## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo; ## otherwise, we would need it for getting dependencies.) +## +## We override this in the explicit build matrix to work around a +## Travis CI environment regression +## https://github.com/travis-ci/travis-ci/issues/9033 sudo: false ## (Linux only) Download our dependencies @@ -61,6 +67,18 @@ matrix: ## entire job early and call the whole thing a failure. fast_finish: true + ## Create explicit matrix entries to work around a Travis CI + ## environment issue. Missing keys inherit from the first list + ## entry under that key outside the "include" clause. + include: + - compiler: gcc + ## The "sudo: required" forces non-containerized builds, working + ## around a Travis CI environment issue: clang LeakAnalyzer fails + ## because it requires ptrace and the containerized environment no + ## longer allows ptrace. + - compiler: clang + sudo: required + before_install: ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.9
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d Merge: 9464da210 49de586ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:16:47 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit e2aacf100f5112aa8d0564b9f90ce38048ee0a82 Merge: 44388757c 483a59ec2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:18:29 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit fa6137a903ef984f64d89e984cf285bf5158e08f Merge: 63e549a6b e2aacf100 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:18:59 2018 -0500 Merge branch 'maint-0.3.2'

1 0

[tor/master] Work around Travis CI ptrace regression
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 0e7f1b06e90e91006e781c3c8387e15368abd543 Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents LeakSanitizer on clang from working properly. Set "sudo: required" to force non-container builds for clang and work around this. --- .travis.yml | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cc210827..19bbe6df0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: c -compiler: - - gcc - - clang +## Comment out the compiler list for now to allow an explicit build +## matrix. +# compiler: +# - gcc +# - clang notifications: irc: @@ -28,6 +30,10 @@ dist: trusty ## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo; ## otherwise, we would need it for getting dependencies.) +## +## We override this in the explicit build matrix to work around a +## Travis CI environment regression +## https://github.com/travis-ci/travis-ci/issues/9033 sudo: false ## (Linux only) Download our dependencies @@ -55,8 +61,12 @@ env: ## The Travis CI environment allows us two cores, so let's use both. - MAKEFLAGS="-j 2" matrix: + ## Leave at least one entry here or Travis seems to generate a + ## matrix entry with empty matrix environment variables. Leaving + ## more than one entry causes unwanted matrix entries with + ## unspecified compilers. - RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - - RUST_OPTIONS="" + # - RUST_OPTIONS="" matrix: ## If one build in the matrix fails (e.g. if building withour Rust and Clang @@ -64,6 +74,23 @@ matrix: ## entire job early and call the whole thing a failure. fast_finish: true + ## Create explicit matrix entries to work around a Travis CI + ## environment issue. Missing keys inherit from the first list + ## entry under that key outside the "include" clause. + include: + - compiler: gcc + - compiler: gcc + env: RUST_OPTIONS="" + ## The "sudo: required" forces non-containerized builds, working + ## around a Travis CI environment issue: clang LeakAnalyzer fails + ## because it requires ptrace and the containerized environment no + ## longer allows ptrace. + - compiler: clang + sudo: required + - compiler: clang + sudo: required + env: RUST_OPTIONS="" + before_install: ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 9652c65fa3b9b3346d346daea05c8b3c22b3e125 Merge: 2c9e0a286 483a59ec2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:18:35 2018 -0500 Merge branch 'maint-0.3.1' "ours" merge to avoid the 0.3.1 version of the 24863 fix.

1 0

[tor/master] Work around Travis CI ptrace regression
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 3bf9174fa37ed09b796dd34c0c2918dae7d4de0d Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents LeakSanitizer on clang from working properly. Set "sudo: required" to force non-container builds for clang and work around this. --- .travis.yml | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3918875d..6c6e1ace2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: c -compiler: - - gcc - - clang +## Comment out the compiler list for now to allow an explicit build +## matrix. +# compiler: +# - gcc +# - clang notifications: irc: @@ -28,6 +30,10 @@ dist: trusty ## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo; ## otherwise, we would need it for getting dependencies.) +## +## We override this in the explicit build matrix to work around a +## Travis CI environment regression +## https://github.com/travis-ci/travis-ci/issues/9033 sudo: false ## (Linux only) Download our dependencies @@ -55,9 +61,13 @@ env: ## The Travis CI environment allows us two cores, so let's use both. - MAKEFLAGS="-j 2" matrix: + ## Leave at least one entry here or Travis seems to generate a + ## matrix entry with empty matrix environment variables. Leaving + ## more than one entry causes unwanted matrix entries with + ## unspecified compilers. - RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - - RUST_OPTIONS="" + # - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + # - RUST_OPTIONS="" matrix: ## If one build in the matrix fails (e.g. if building withour Rust and Clang @@ -65,6 +75,28 @@ matrix: ## entire job early and call the whole thing a failure. fast_finish: true + ## Create explicit matrix entries to work around a Travis CI + ## environment issue. Missing keys inherit from the first list + ## entry under that key outside the "include" clause. + include: + - compiler: gcc + - compiler: gcc + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - compiler: gcc + env: RUST_OPTIONS="" + ## The "sudo: required" forces non-containerized builds, working + ## around a Travis CI environment issue: clang LeakAnalyzer fails + ## because it requires ptrace and the containerized environment no + ## longer allows ptrace. + - compiler: clang + sudo: required + - compiler: clang + sudo: required + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - compiler: clang + sudo: required + env: RUST_OPTIONS="" + before_install: ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi

1 0