diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-09-18 19:06:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-09-18 19:06:39 -0400 |
| commit | e411360f6dda7b1a44816cbf408579b1c321763a (patch) | |
| tree | 20299a1c6da64894d5c14c63aed7c689b060b056 | |
| parent | 485990641ba765414a0e69ce7f2cc57f018c3bed (diff) | |
| parent | 09813fe31e506daf16fe29d830aef848f16ac18f (diff) | |
| download | tor-e411360f6dda7b1a44816cbf408579b1c321763a.tar.gz tor-e411360f6dda7b1a44816cbf408579b1c321763a.zip | |
Merge branch 'maint-0.4.4'
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48bcf6b000..ce279a4bce 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: @@ -167,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 |