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

[tor/release-0.4.3] Add a pair of warnings about only editing CI in 035
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 8a0f530adffc4dbdb1afa065b214dd282f8bca8f Author: Nick Mathewson <nickm(a)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. #

1 0

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

11 Aug '20

commit e0caad5d4fb19d0770c0492c924193005b21e42e Merge: ffe240951e 262ddfee7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .gitlab-ci.yml | 5 +++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 10 insertions(+)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 262ddfee7a8816b9f7990467df0e495e27f387db Merge: f3fcc89d05 e4a6d9d5a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .gitlab-ci.yml | 5 +++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 10 insertions(+)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit e4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b Merge: 68f8250cbb 8a0f530adf Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 5 +++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 10 insertions(+)

1 0

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

11 Aug '20

commit 3854123b0b786acd935edddad32160bbef27e96f Merge: 39882a2021 d83703317d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 .gitlab-ci.yml | 5 +++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 10 insertions(+)

1 0

[tor/maint-0.3.5] Add a pair of warnings about only editing CI in 035
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 8a0f530adffc4dbdb1afa065b214dd282f8bca8f Author: Nick Mathewson <nickm(a)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. #

1 0

[tor/maint-0.4.2] Add a pair of warnings about only editing CI in 035
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 8a0f530adffc4dbdb1afa065b214dd282f8bca8f Author: Nick Mathewson <nickm(a)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. #

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit e4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b Merge: 68f8250cbb 8a0f530adf Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 5 +++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 10 insertions(+)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit e4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b Merge: 68f8250cbb 8a0f530adf Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 5 +++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 10 insertions(+)

1 0

[tor/maint-0.4.3] Add a pair of warnings about only editing CI in 035
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 8a0f530adffc4dbdb1afa065b214dd282f8bca8f Author: Nick Mathewson <nickm(a)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. #

1 0