tor

commit 18a2191a137004387a19a799a11529404d39f7e8
parent 2de98a7f4ea86c234990747fb566e70fef6aee15
Author: Micah Elizabeth Scott <beth@torproject.org>
Date:   Thu,  9 Mar 2023 15:37:25 -0800

gitlab-ci: Try enabling GPL mode so we test hs_pow

Signed-off-by: Micah Elizabeth Scott <beth@torproject.org>

Diffstat:
M
.gitlab-ci.yml
 | 
10
++++++++++
M
scripts/ci/ci-driver.sh
 | 
5
+++++

2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -212,6 +212,16 @@ debian-disable-relay:
     - ./scripts/ci/ci-driver.sh
 
 #####
+# GPL licensed mode, enables pow module
+debian-gpl:
+  image: debian:buster
+  <<: *debian-template
+  variables:
+    GPL: "yes"
+  script:
+    - ./scripts/ci/ci-driver.sh
+
+#####
 # NSS check on debian
 debian-nss:
   image: debian:buster
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
@@ -37,6 +37,7 @@ ALL_BUGS_ARE_FATAL="${ALL_BUGS_ARE_FATAL:-no}"
 DISABLE_DIRAUTH="${DISABLE_DIRAUTH:-no}"
 DISABLE_RELAY="${DISABLE_RELAY:-no}"
 NSS="${NSS:-no}"
+GPL="${GPL:-no}"
 
 # Options for which tests to run.   All should be yes/no.
 CHECK="${CHECK:-yes}"
@@ -200,6 +201,7 @@ yes_or_no ALL_BUGS_ARE_FATAL
 yes_or_no DISABLE_DIRAUTH
 yes_or_no DISABLE_RELAY
 yes_or_no NSS
+yes_or_no GPL
 
 yes_or_no RUN_STAGE_CONFIGURE
 yes_or_no RUN_STAGE_BUILD
@@ -262,6 +264,9 @@ fi
 if [[ "$NSS" == "yes" ]]; then
     configure_options+=("--enable-nss")
 fi
+if [[ "$GPL" == "yes" ]]; then
+    configure_options+=("--enable-gpl")
+fi
 
 #############################################################################
 # Tell the user about our versions of different tools and packages.