From 37e034cb83d944c3dee8cc66c5cfa05872c9fe72 Mon Sep 17 00:00:00 2001 From: Jaap Eldering Date: Thu, 19 Sep 2024 06:38:18 +0200 Subject: [PATCH] TEST --- .github/jobs/configure-checks/all.bats | 4 ++-- .github/jobs/configure-checks/setup_configure_image.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/jobs/configure-checks/all.bats b/.github/jobs/configure-checks/all.bats index 05229996a7..9fd6ebf2bc 100755 --- a/.github/jobs/configure-checks/all.bats +++ b/.github/jobs/configure-checks/all.bats @@ -178,8 +178,8 @@ compile_assertions_finished () { groupdel ${www_group} || true done repo-install httpd -# grep -E 'nginx|apache' /etc/passwd || true -# grep -E 'nginx|apache' /etc/group || true + grep -E 'nginx|apache' /etc/passwd || true + grep -E 'nginx|apache' /etc/group || true 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 index 6043bf0d69..070c77a68d 100755 --- a/.github/jobs/configure-checks/setup_configure_image.sh +++ b/.github/jobs/configure-checks/setup_configure_image.sh @@ -7,14 +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 || true -# grep -E 'nginx|apache' /etc/group || true + grep -E 'nginx|apache' /etc/passwd || true + grep -E 'nginx|apache' /etc/group || true dnf install -y pkg-config make bats autoconf automake util-linux \ php-fpm -# grep -E 'nginx|apache' /etc/passwd || true -# grep -E 'nginx|apache' /etc/group || true + grep -E 'nginx|apache' /etc/passwd || true + grep -E 'nginx|apache' /etc/group || true ;; *) apt-get update; apt-get full-upgrade -y