DEBUG

DOMjudge · Sep 18, 2024 · 35d55c2 · 35d55c2
1 parent 2601b27
commit 35d55c2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/.github/jobs/configure-checks/all.bats b/.github/jobs/configure-checks/all.bats
@@ -1,4 +1,4 @@
-#!/usr/bin/env bats
+#!/usr/bin/env bats --trace
 
 load 'assert'
 
@@ -46,13 +46,13 @@ run_configure () {
 
 repo-install () {
     args=$(translate $@)
-    ${cmd} install $args -y >/dev/null
+    ${cmd} install $args -y
 }
 repo-remove () {
     args=$(translate $@)
     ${cmd} remove $args -y #>/dev/null
     if [ "$distro_id" != "ID=fedora" ]; then
-        apt-get autoremove -y 2>/dev/null
+        apt-get autoremove -y
     fi
 }
 
@@ -178,6 +178,8 @@ compile_assertions_finished () {
         groupdel ${www_group} || true
     done
     repo-install httpd
+	grep -E 'nginx|apache' /etc/passwd
+	grep -E 'nginx|apache' /etc/group
     run ./configure --with-domjudge-user=$u
     assert_line "checking webserver-group... apache (detected)"
     assert_line " * webserver group.....: apache"

diff --git a/.github/jobs/configure-checks/setup_configure_image.sh b/.github/jobs/configure-checks/setup_configure_image.sh
@@ -7,8 +7,14 @@ distro_id=$(grep "^ID=" /etc/os-release)
 # Install everything for configure and testing
 case $distro_id in
     "ID=fedora")
+        grep -E 'nginx|apache' /etc/passwd
+	    grep -E 'nginx|apache' /etc/group
+
         dnf install -y pkg-config make bats autoconf automake util-linux \
-            php-fpm
+            httpd
+
+        grep -E 'nginx|apache' /etc/passwd
+	    grep -E 'nginx|apache' /etc/group
         ;;
     *)
         apt-get update; apt-get full-upgrade -y
@@ -27,4 +33,4 @@ make configure
 cp submit/assert.bash .github/jobs/configure-checks/
 
 # Run the configure tests for this usecase
-test_path="/__w/domjudge/domjudge" bats .github/jobs/configure-checks/all.bats
+test_path="/__w/domjudge/domjudge" bats --trace .github/jobs/configure-checks/all.bats