August 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 0ec2d1528cc8f80fe134c37961f8724696468aa9 Merge: 6bee9bd481 c6c0af403c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .gitlab-ci.yml | 5 +++-- scripts/ci/ci-driver.sh | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 2b968446d9c0634a6fb3305a10879b4f29684877 Merge: 673d02bdb0 0ec2d1528c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 5 +++-- scripts/ci/ci-driver.sh | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-)

1 0

[tor/master] CI: Only run doxygen on 0.4.3 and later.
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 9eb316de4295086d534a7576cc13606a42544c9f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:22:35 2020 -0400 CI: Only run doxygen on 0.4.3 and later. --- scripts/ci/ci-driver.sh | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index a675335115..20193e6b2a 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -267,6 +267,29 @@ if [[ "${CHUTNEY}" = "yes" ]]; then show_git_version Chutney "${CHUTNEY_PATH}" fi +############################################################################# +# Determine the version of Tor. + +TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;') + +# Use variables like these when we need to behave differently depending on +# Tor version. Only create the variables we need. +TOR_VER_AT_LEAST_043=no + +# These are the currently supported Tor versions; no need to work with anything +# ancient in this script. +case "$TOR_VERSION" in + 0.3.*) + TOR_VER_AT_LEAST_043=no + ;; + 0.4.[012].*) + TOR_VER_AT_LEAST_043=no + ;; + *) + TOR_VER_AT_LEAST_043=yes + ;; +esac + ############################################################################# # Make sure the directories are all there. @@ -362,7 +385,7 @@ fi FAILED_TESTS="" -if [[ "${DOXYGEN}" = 'yes' ]]; then +if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then start_section Doxygen if runcmd make doxygen; then hooray "make doxygen has succeeded."

1 0

[tor/master] CI: enable documentation testing
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 6a91a50d32c6d3beaa059660881e0c338b147b1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 11:06:21 2020 -0400 CI: enable documentation testing --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a46c1a0e3..abc5003678 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,12 +105,13 @@ debian-distcheck: script: - ./scripts/ci/ci-driver.sh +# TODO: it would be neat to disable the "make all" part of this one. debian-docs: image: debian:stable <<: *debian-template variables: - DOXYGEN: "no" - ASCIIDOC: "no" + DOXYGEN: "yes" + ASCIIDOC: "yes" CHECK: "no" script: - ./scripts/ci/ci-driver.sh

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit c6c0af403c9b8dccba96677b60d86670a651893d Merge: da8577bb75 adb7268236 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 5 +++-- scripts/ci/ci-driver.sh | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-)

1 0

[tor/master] CI: label our python versions.
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit adb7268236683ed54dedf455598b86596d7ab8ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:24:03 2020 -0400 CI: label our python versions. --- scripts/ci/ci-driver.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 20193e6b2a..ad08ee5af0 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -256,7 +256,9 @@ fi # Tell the user about our versions of different tools and packages. uname -a +printf "python: " python -V || echo "no 'python' binary." +printf "python3: " python3 -V || echo "no 'python3' binary." show_git_version Tor "${CI_SRCDIR}"

1 0

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit da9684d89a7b0de39c142c4273646cd972b45437 Merge: e4ef3c61f7 2b968446d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.4.4' .gitlab-ci.yml | 5 +++-- scripts/ci/ci-driver.sh | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.5] CI: Only run doxygen on 0.4.3 and later.
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 9eb316de4295086d534a7576cc13606a42544c9f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:22:35 2020 -0400 CI: Only run doxygen on 0.4.3 and later. --- scripts/ci/ci-driver.sh | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index a675335115..20193e6b2a 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -267,6 +267,29 @@ if [[ "${CHUTNEY}" = "yes" ]]; then show_git_version Chutney "${CHUTNEY_PATH}" fi +############################################################################# +# Determine the version of Tor. + +TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;') + +# Use variables like these when we need to behave differently depending on +# Tor version. Only create the variables we need. +TOR_VER_AT_LEAST_043=no + +# These are the currently supported Tor versions; no need to work with anything +# ancient in this script. +case "$TOR_VERSION" in + 0.3.*) + TOR_VER_AT_LEAST_043=no + ;; + 0.4.[012].*) + TOR_VER_AT_LEAST_043=no + ;; + *) + TOR_VER_AT_LEAST_043=yes + ;; +esac + ############################################################################# # Make sure the directories are all there. @@ -362,7 +385,7 @@ fi FAILED_TESTS="" -if [[ "${DOXYGEN}" = 'yes' ]]; then +if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then start_section Doxygen if runcmd make doxygen; then hooray "make doxygen has succeeded."

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit c6c0af403c9b8dccba96677b60d86670a651893d Merge: da8577bb75 adb7268236 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 5 +++-- scripts/ci/ci-driver.sh | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 2b968446d9c0634a6fb3305a10879b4f29684877 Merge: 673d02bdb0 0ec2d1528c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 5 +++-- scripts/ci/ci-driver.sh | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-)

1 0