commit 8a0f530adffc4dbdb1afa065b214dd282f8bca8f Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 11 10:44:32 2020 -0400

Add a pair of warnings about only editing CI in 035 --- .gitlab-ci.yml | 5 +++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 10 insertions(+)

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. #