Commit 0ec2d152 authored by Nick Mathewson's avatar Nick Mathewson 🐻
Browse files

Merge branch 'maint-0.4.2' into maint-0.4.3

parents 6bee9bd4 c6c0af40
...@@ -105,12 +105,13 @@ debian-distcheck: ...@@ -105,12 +105,13 @@ debian-distcheck:
script: script:
- ./scripts/ci/ci-driver.sh - ./scripts/ci/ci-driver.sh
# TODO: it would be neat to disable the "make all" part of this one.
debian-docs: debian-docs:
image: debian:stable image: debian:stable
<<: *debian-template <<: *debian-template
variables: variables:
DOXYGEN: "no" DOXYGEN: "yes"
ASCIIDOC: "no" ASCIIDOC: "yes"
CHECK: "no" CHECK: "no"
script: script:
- ./scripts/ci/ci-driver.sh - ./scripts/ci/ci-driver.sh
...@@ -256,7 +256,9 @@ fi ...@@ -256,7 +256,9 @@ fi
# Tell the user about our versions of different tools and packages. # Tell the user about our versions of different tools and packages.
uname -a uname -a
printf "python: "
python -V || echo "no 'python' binary." python -V || echo "no 'python' binary."
printf "python3: "
python3 -V || echo "no 'python3' binary." python3 -V || echo "no 'python3' binary."
show_git_version Tor "${CI_SRCDIR}" show_git_version Tor "${CI_SRCDIR}"
...@@ -267,6 +269,29 @@ if [[ "${CHUTNEY}" = "yes" ]]; then ...@@ -267,6 +269,29 @@ if [[ "${CHUTNEY}" = "yes" ]]; then
show_git_version Chutney "${CHUTNEY_PATH}" show_git_version Chutney "${CHUTNEY_PATH}"
fi 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. # Make sure the directories are all there.
...@@ -362,7 +387,7 @@ fi ...@@ -362,7 +387,7 @@ fi
FAILED_TESTS="" FAILED_TESTS=""
if [[ "${DOXYGEN}" = 'yes' ]]; then if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
start_section Doxygen start_section Doxygen
if runcmd make doxygen; then if runcmd make doxygen; then
hooray "make doxygen has succeeded." hooray "make doxygen has succeeded."
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment