Skip to content

Commit 35d55c2

Browse files
committed
DEBUG
1 parent 2601b27 commit 35d55c2

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/jobs/configure-checks/all.bats

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bats
1+
#!/usr/bin/env bats --trace
22

33
load 'assert'
44

@@ -46,13 +46,13 @@ run_configure () {
4646

4747
repo-install () {
4848
args=$(translate $@)
49-
${cmd} install $args -y >/dev/null
49+
${cmd} install $args -y
5050
}
5151
repo-remove () {
5252
args=$(translate $@)
5353
${cmd} remove $args -y #>/dev/null
5454
if [ "$distro_id" != "ID=fedora" ]; then
55-
apt-get autoremove -y 2>/dev/null
55+
apt-get autoremove -y
5656
fi
5757
}
5858

@@ -178,6 +178,8 @@ compile_assertions_finished () {
178178
groupdel ${www_group} || true
179179
done
180180
repo-install httpd
181+
grep -E 'nginx|apache' /etc/passwd
182+
grep -E 'nginx|apache' /etc/group
181183
run ./configure --with-domjudge-user=$u
182184
assert_line "checking webserver-group... apache (detected)"
183185
assert_line " * webserver group.....: apache"

.github/jobs/configure-checks/setup_configure_image.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,14 @@ distro_id=$(grep "^ID=" /etc/os-release)
77
# Install everything for configure and testing
88
case $distro_id in
99
"ID=fedora")
10+
grep -E 'nginx|apache' /etc/passwd
11+
grep -E 'nginx|apache' /etc/group
12+
1013
dnf install -y pkg-config make bats autoconf automake util-linux \
11-
php-fpm
14+
httpd
15+
16+
grep -E 'nginx|apache' /etc/passwd
17+
grep -E 'nginx|apache' /etc/group
1218
;;
1319
*)
1420
apt-get update; apt-get full-upgrade -y
@@ -27,4 +33,4 @@ make configure
2733
cp submit/assert.bash .github/jobs/configure-checks/
2834

2935
# Run the configure tests for this usecase
30-
test_path="/__w/domjudge/domjudge" bats .github/jobs/configure-checks/all.bats
36+
test_path="/__w/domjudge/domjudge" bats --trace .github/jobs/configure-checks/all.bats

0 commit comments

Comments
 (0)