From 6a91a50d32c6d3beaa059660881e0c338b147b1b Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 11 Aug 2020 11:06:21 -0400
Subject: [PATCH 1/3] CI: enable documentation testing

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a46c1a0e3..abc5003678 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,12 +105,13 @@ debian-distcheck:
   script:
     - ./scripts/ci/ci-driver.sh
 
+# TODO: it would be neat to disable the "make all" part of this one.
 debian-docs:
   image: debian:stable
   <<: *debian-template
   variables:
-    DOXYGEN: "no"
-    ASCIIDOC: "no"
+    DOXYGEN: "yes"
+    ASCIIDOC: "yes"
     CHECK: "no"
   script:
     - ./scripts/ci/ci-driver.sh

From 9eb316de4295086d534a7576cc13606a42544c9f Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 11 Aug 2020 12:22:35 -0400
Subject: [PATCH 2/3] CI: Only run doxygen on 0.4.3 and later.

---
 scripts/ci/ci-driver.sh | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index a675335115..20193e6b2a 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -267,6 +267,29 @@ if [[ "${CHUTNEY}" = "yes" ]]; then
     show_git_version Chutney "${CHUTNEY_PATH}"
 fi
 
+#############################################################################
+# Determine the version of Tor.
+
+TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;')
+
+# Use variables like these when we need to behave differently depending on
+# Tor version.  Only create the variables we need.
+TOR_VER_AT_LEAST_043=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
+        ;;
+    0.4.[012].*)
+        TOR_VER_AT_LEAST_043=no
+        ;;
+    *)
+        TOR_VER_AT_LEAST_043=yes
+        ;;
+esac
+
 #############################################################################
 # Make sure the directories are all there.
 
@@ -362,7 +385,7 @@ fi
 
 FAILED_TESTS=""
 
-if [[ "${DOXYGEN}" = 'yes' ]]; then
+if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
     start_section Doxygen
     if runcmd make doxygen; then
 	hooray "make doxygen has succeeded."

From adb7268236683ed54dedf455598b86596d7ab8ee Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 11 Aug 2020 12:24:03 -0400
Subject: [PATCH 3/3] CI: label our python versions.

---
 scripts/ci/ci-driver.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 20193e6b2a..ad08ee5af0 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -256,7 +256,9 @@ fi
 # Tell the user about our versions of different tools and packages.
 
 uname -a
+printf "python: "
 python -V || echo "no 'python' binary."
+printf "python3: "
 python3 -V || echo "no 'python3' binary."
 
 show_git_version Tor "${CI_SRCDIR}"