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

[tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 18 Sep '20

18 Sep '20

commit 09813fe31e506daf16fe29d830aef848f16ac18f Merge: 2e3603d96d b643ced022 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 18 19:06:16 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 27 ++++++++++++++++++++++++++- scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 31 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 18 Sep '20

18 Sep '20

commit 075beab2fb5a5cf3e016ddde94fed8c415b93dd4 Merge: 3028e85b11 b643ced022 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 18 19:06:16 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .gitlab-ci.yml | 27 ++++++++++++++++++++++++++- scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 31 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 18 Sep '20

18 Sep '20

commit b643ced0224268dfe3d9c3617b3a77f8aec6205e Merge: 2ddbfc64af 0b77c706a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 18 19:06:16 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 .gitlab-ci.yml | 27 ++++++++++++++++++++++++++- scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 31 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 18 Sep '20

18 Sep '20

commit e780277c4dabfeed9e31ded8c8b0381f3b8bf3ec Merge: 453d5c2547 09813fe31e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 18 19:06:16 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 .gitlab-ci.yml | 27 ++++++++++++++++++++++++++- scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 31 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] Make debian-trace job conditional on src/lib/trace/trace_sys.c
by nickm＠torproject.org 18 Sep '20

18 Sep '20

commit 0b77c706a1799d2ee6d8da4737bb7f152140e3c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 18 15:56:59 2020 -0400 Make debian-trace job conditional on src/lib/trace/trace_sys.c --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 028a49f52c..ce279a4bce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -168,3 +168,15 @@ debian-tracing: CHECK: "no" script: - ./scripts/ci/ci-driver.sh + # Ensure that we only run tracing when it's implemented. + # + # Once versions before 0.4.5 are obsolete, we can remove this test. + rules: + # This first "if" check prevents us from running a duplicate version of + # this pipeline whenever we push and create an MR. I don't understand why + # it is necessary, though the following URL purports to explain: + # + # https://docs.gitlab.com/ee/ci/yaml/#prevent-duplicate-pipelines + - if: '$CI_PIPELINE_SOURCE == "push"' + exists: + - src/lib/trace/trace_sys.c

1 0

[tor/maint-0.4.3] .gitlab.yml: missing comments
by nickm＠torproject.org 18 Sep '20

18 Sep '20

commit f8f3e57016214685a2474342883eb16dfaf22ce1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 18 15:55:02 2020 -0400 .gitlab.yml: missing comments --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48bcf6b000..028a49f52c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,7 @@ variables: paths: - artifacts/ -# This template +# This template should be usable on any system that's based on apt. .apt-template: &apt-template | export LC_ALL=C.UTF-8 echo Etc/UTC > /etc/timezone @@ -54,6 +54,7 @@ variables: apt-get update -qq apt-get upgrade -qy +# This template sets us up for Debian system in particular. .debian-template: &debian-template <<: *artifacts-template variables:

1 0

[tor/maint-0.3.5] Copy tracing things back to maint-0.3.5, for consistency.
by nickm＠torproject.org 18 Sep '20

18 Sep '20

commit 122b297a204437dfccf75b638a555c360a6765f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 18 15:53:06 2020 -0400 Copy tracing things back to maint-0.3.5, for consistency. --- .gitlab-ci.yml | 12 ++++++++++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 176c71f8f0..48bcf6b000 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,6 +92,7 @@ variables: - if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi # TODO: This next line should not be debian-only. - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi + - if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi # Minmal check on debian: just make, make check. # @@ -155,3 +156,14 @@ debian-integration: STEM: "yes" script: - ./scripts/ci/ci-driver.sh + +##### +# Tracing build on Debian stable. +debian-tracing: + image: debian:stable + <<: *debian-template + variables: + TRACING: "yes" + CHECK: "no" + script: + - ./scripts/ci/ci-driver.sh diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 527bba82e5..cd91a91bbf 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -33,6 +33,7 @@ COVERAGE="${COVERAGE:-no}" RUST="${RUST:-no}" DOXYGEN="${DOXYGEN:-no}" ASCIIDOC="${ASCIIDOC:-no}" +TRACING="${TRACING:-no}" # Options for which tests to run. All should be yes/no. CHECK="${CHECK:-yes}" @@ -191,6 +192,7 @@ yes_or_no COVERAGE yes_or_no RUST yes_or_no DOXYGEN yes_or_no ASCIIDOC +yes_or_no TRACING yes_or_no RUN_STAGE_CONFIGURE yes_or_no RUN_STAGE_BUILD @@ -241,6 +243,9 @@ fi if [[ "$ASCIIDOC" != "yes" ]]; then configure_options+=("--disable-asciidoc") fi +if [[ "$TRACING" == "yes" ]]; then + configure_options+=("--enable-tracing-instrumentation-lttng") +fi ############################################################################# # Tell the user about our versions of different tools and packages.

1 0

[tor/maint-0.3.5] .gitlab.yml: missing comments
by nickm＠torproject.org 18 Sep '20

18 Sep '20

commit f8f3e57016214685a2474342883eb16dfaf22ce1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 18 15:55:02 2020 -0400 .gitlab.yml: missing comments --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48bcf6b000..028a49f52c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,7 @@ variables: paths: - artifacts/ -# This template +# This template should be usable on any system that's based on apt. .apt-template: &apt-template | export LC_ALL=C.UTF-8 echo Etc/UTC > /etc/timezone @@ -54,6 +54,7 @@ variables: apt-get update -qq apt-get upgrade -qy +# This template sets us up for Debian system in particular. .debian-template: &debian-template <<: *artifacts-template variables:

1 0

[tor/maint-0.4.3] Copy tracing things back to maint-0.3.5, for consistency.
by nickm＠torproject.org 18 Sep '20

18 Sep '20

commit 122b297a204437dfccf75b638a555c360a6765f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 18 15:53:06 2020 -0400 Copy tracing things back to maint-0.3.5, for consistency. --- .gitlab-ci.yml | 12 ++++++++++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 176c71f8f0..48bcf6b000 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,6 +92,7 @@ variables: - if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi # TODO: This next line should not be debian-only. - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi + - if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi # Minmal check on debian: just make, make check. # @@ -155,3 +156,14 @@ debian-integration: STEM: "yes" script: - ./scripts/ci/ci-driver.sh + +##### +# Tracing build on Debian stable. +debian-tracing: + image: debian:stable + <<: *debian-template + variables: + TRACING: "yes" + CHECK: "no" + script: + - ./scripts/ci/ci-driver.sh diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 527bba82e5..cd91a91bbf 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -33,6 +33,7 @@ COVERAGE="${COVERAGE:-no}" RUST="${RUST:-no}" DOXYGEN="${DOXYGEN:-no}" ASCIIDOC="${ASCIIDOC:-no}" +TRACING="${TRACING:-no}" # Options for which tests to run. All should be yes/no. CHECK="${CHECK:-yes}" @@ -191,6 +192,7 @@ yes_or_no COVERAGE yes_or_no RUST yes_or_no DOXYGEN yes_or_no ASCIIDOC +yes_or_no TRACING yes_or_no RUN_STAGE_CONFIGURE yes_or_no RUN_STAGE_BUILD @@ -241,6 +243,9 @@ fi if [[ "$ASCIIDOC" != "yes" ]]; then configure_options+=("--disable-asciidoc") fi +if [[ "$TRACING" == "yes" ]]; then + configure_options+=("--enable-tracing-instrumentation-lttng") +fi ############################################################################# # Tell the user about our versions of different tools and packages.

1 0

[tor/maint-0.4.3] Make debian-trace job conditional on src/lib/trace/trace_sys.c
by nickm＠torproject.org 18 Sep '20

18 Sep '20

commit 0b77c706a1799d2ee6d8da4737bb7f152140e3c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 18 15:56:59 2020 -0400 Make debian-trace job conditional on src/lib/trace/trace_sys.c --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 028a49f52c..ce279a4bce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -168,3 +168,15 @@ debian-tracing: CHECK: "no" script: - ./scripts/ci/ci-driver.sh + # Ensure that we only run tracing when it's implemented. + # + # Once versions before 0.4.5 are obsolete, we can remove this test. + rules: + # This first "if" check prevents us from running a duplicate version of + # this pipeline whenever we push and create an MR. I don't understand why + # it is necessary, though the following URL purports to explain: + # + # https://docs.gitlab.com/ee/ci/yaml/#prevent-duplicate-pipelines + - if: '$CI_PIPELINE_SOURCE == "push"' + exists: + - src/lib/trace/trace_sys.c

1 0