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 | e4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b (patch) | |
| tree | 17e61c0b53ab139ec1dd10c777d36073a1c70d32 | |
| parent | 68f8250cbb6f1844e7f16f5f1bc8063b8bbfdf14 (diff) | |
| parent | 8a0f530adffc4dbdb1afa065b214dd282f8bca8f (diff) | |
| download | tor-e4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b.tar.gz tor-e4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.2
| -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. # |