[tor-commits] [tor/main] Remove unmaintained versions from CI and scripts

[dgoulet at torproject.org]

commit 2176354e223a51399afab4bd0a0b57e09f4e0c72
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Feb 4 13:00:56 2022 -0500

    Remove unmaintained versions from CI and scripts
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 .gitlab-ci.yml                       | 24 ------------------------
 scripts/ci/ci-driver.sh              | 16 ----------------
 scripts/git/git-list-tor-branches.sh |  3 ---
 3 files changed, 43 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6bcf38c54..b27e75855a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -188,18 +188,6 @@ debian-tracing:
     DISTCHECK: "yes"
   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
 
 #####
 # No-authority mode
@@ -220,18 +208,6 @@ debian-disable-relay:
     DISABLE_RELAY: "yes"
   script:
     - ./scripts/ci/ci-driver.sh
-  # Ensure that we only run tracing when it's implemented.
-  #
-  # Once versions before 0.4.3 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/feature/relay/relay_stub.c
 
 #####
 # NSS check on debian
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index c9f63c2f40..09696924ba 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -293,22 +293,6 @@ TOR_VER_AT_LEAST_044=no
 # These are the currently supported Tor versions; no need to work with anything
 # ancient in this script.
 case "$TOR_VERSION" in
-    0.3.*)
-        TOR_VER_AT_LEAST_043=no
-        TOR_VER_AT_LEAST_044=no
-        ;;
-    0.4.[012].*)
-        TOR_VER_AT_LEAST_043=no
-        TOR_VER_AT_LEAST_044=no
-        ;;
-    0.4.3.*)
-        TOR_VER_AT_LEAST_043=yes
-        TOR_VER_AT_LEAST_044=no
-        ;;
-    0.4.4.*)
-        TOR_VER_AT_LEAST_043=yes
-        TOR_VER_AT_LEAST_044=yes
-        ;;
     0.4.5.*)
         TOR_VER_AT_LEAST_043=yes
         TOR_VER_AT_LEAST_044=yes
diff --git a/scripts/git/git-list-tor-branches.sh b/scripts/git/git-list-tor-branches.sh
index 29e91dd1b6..d7142620d7 100755
--- a/scripts/git/git-list-tor-branches.sh
+++ b/scripts/git/git-list-tor-branches.sh
@@ -143,9 +143,6 @@ finish() {
 # List of all branches.  These must be in order, from oldest to newest, with
 # maint before release.
 
-branch maint-0.3.5
-branch release-0.3.5
-
 branch maint-0.4.5
 branch release-0.4.5