diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-08-11 10:44:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-08-11 10:44:40 -0400 |
| commit | d83703317d8dc9ca9118c161cf4e383b3d121084 (patch) | |
| tree | 942f5679b53bdf1aaf5958832ae97f375510d3ee | |
| parent | ab9c35f04353c00323068ec5dc46b2995a9b69bf (diff) | |
| parent | 262ddfee7a8816b9f7990467df0e495e27f387db (diff) | |
| download | tor-d83703317d8dc9ca9118c161cf4e383b3d121084.tar.gz tor-d83703317d8dc9ca9118c161cf4e383b3d121084.zip | |
Merge branch 'maint-0.4.3' into maint-0.4.4
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rwxr-xr-x | scripts/ci/ci-driver.sh | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc160ffaea..5a46c1a0e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,8 @@ +#### +# DO NOT EDIT THIS FILE IN MASTER. ONLY EDIT IT IN THE OLDEST SUPPORTED +# BRANCH, THEN MERGE FORWARD. +#### + # This file controls how gitlab validates Tor commits and merge requests. # # It is primarily based on a set of scripts and configurations by diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 50728a137e..bede68baa8 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -1,5 +1,10 @@ #!/bin/bash +#### +# DO NOT EDIT THIS FILE IN MASTER. ONLY EDIT IT IN THE OLDEST SUPPORTED +# BRANCH, THEN MERGE FORWARD. +#### + # This script is used to build Tor for continuous integration. It should # be kept the same for all supported Tor versions. # |