Try disabling "make all" when checking docs.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3959bba02446ea68dd566c8b45340bc03c239a62..8ed615687b920c0531d08bab5c3dbe48b3014535 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,7 +111,6 @@ 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
@@ -119,6 +118,7 @@ debian-docs:
     DOXYGEN: "yes"
     ASCIIDOC: "yes"
     CHECK: "no"
+    RUN_STAGE_BUILD: "no"
   script:
     - ./scripts/ci/ci-driver.sh
 

diff --git a/Makefile.am b/Makefile.am
index 5d18666edca17f016a77a517d43f8d8d53b7c805..a868be7362b9470606ce2a4cb21c9abb8b5b46e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,6 +149,8 @@ include src/include.am
 include doc/include.am
 include contrib/include.am
 
+manpages: $(nodist_man1_MANS)
+
 EXTRA_DIST+= \
        ChangeLog                                       \
        CONTRIBUTING                                    \

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 05c1415da0c41421dd6fabbaeb88e695fd262247..ba4b800c042a4ad3d44dc9a4b721b46c886c76c6 100755 (executable)
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -21,6 +21,11 @@ COLOR_CI="${COLOR_CI:-yes}"
 # Options for which CI system this is.
 ON_GITLAB="${ON_GITLAB:-yes}"
 
+# Options for things we usually won't want to skip.
+RUN_STAGE_CONFIGURE="${RUN_STAGE_CONFIGURE:-yes}"
+RUN_STAGE_BUILD="${RUN_STAGE_BUILD:-yes}"
+RUN_STAGE_TEST="${RUN_STAGE_TEST:-yes}"
+
 # Options for how to build Tor.  All should be yes/no.
 FATAL_WARNINGS="${FATAL_WARNINGS:-yes}"
 HARDENING="${HARDENING:-no}"
@@ -165,33 +170,6 @@ else
     }
 fi
 
-if [[ "$*" == "" ]]; then
-    RUN_STAGE_CONFIGURE="yes"
-    RUN_STAGE_BUILD="yes"
-    RUN_STAGE_TEST="yes"
-else
-    RUN_STAGE_CONFIGURE="no"
-    RUN_STAGE_BUILD="no"
-    RUN_STAGE_TEST="no"
-
-    for stage in "$@"; do
-       case "$stage" in
-           configure)
-               RUN_STAGE_CONFIGURE="yes"
-               ;;
-           build)
-               RUN_STAGE_BUILD="yes"
-               ;;
-           test)
-               RUN_STAGE_TEST="yes"
-               ;;
-           *)
-               error "Unknown stage $stage"
-               ;;
-       esac
-    done
-fi
-
 #############################################################################
 # Validate inputs.
 
@@ -206,6 +184,10 @@ yes_or_no RUST
 yes_or_no DOXYGEN
 yes_or_no ASCIIDOC
 
+yes_or_no RUN_STAGE_CONFIGURE
+yes_or_no RUN_STAGE_BUILD
+yes_or_no RUN_STAGE_TEST
+
 yes_or_no CHECK
 yes_or_no STEM
 yes_or_no DISTCHECK
@@ -370,6 +352,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then
        end_section Distcheck
     fi
 fi
+
 ##############################
 # Run tests.
 
@@ -378,13 +361,6 @@ if [[ "$RUN_STAGE_TEST" == "no" ]]; then
     exit 0
 fi
 
-if [[ "$RUN_STAGE_BUILD" = "no" ]] ; then
-    debug "Skipped build stage. Making sure that ./src/app/tor exists."
-    if [[ ! -f "./src/app/tor" ]]; then
-       die "$(pwd)/src/app/tor does not exist"
-    fi
-fi
-
 FAILED_TESTS=""
 
 if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
@@ -397,6 +373,16 @@ if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
     end_section Doxygen
 fi
 
+if [[ "${ASCIIDOC}" = 'yes' ]]; then
+    start_section Asciidoc
+    if runcmd make manpages; then
+        hooray "make manpages has succeeded."
+    else
+        FAILED_TESTS="${FAILED_TESTS} asciidoc"
+    fi
+    end_section Asciidoc
+fi
+
 if [[ "${CHECK}" = "yes" ]]; then
     start_section "Check"
     if runcmd make "${make_options[@]}" check; then