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

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a4798e3e538f1a596ec4012e07be74af96db4a8..6839f76a6be012fcd2502a3a2f17752b4aafd288 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -211,6 +211,16 @@ debian-disable-relay:
   script:
     - ./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:

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 0c8a866a3d41e451ac7051326204c2961d22d61b..27bb8e34d07026d4408567e1194e5bfc8047789a 100755 (executable)
--- 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.