File tree 2 files changed +13
-5
lines changed
.github/jobs/configure-checks
2 files changed +13
-5
lines changed Original file line number Diff line number Diff line change 1
- #! /usr/bin/env bats
1
+ #! /usr/bin/env bats --trace
2
2
3
3
load ' assert'
4
4
@@ -46,13 +46,13 @@ run_configure () {
46
46
47
47
repo-install () {
48
48
args=$( translate $@ )
49
- ${cmd} install $args -y > /dev/null
49
+ ${cmd} install $args -y
50
50
}
51
51
repo-remove () {
52
52
args=$( translate $@ )
53
53
${cmd} remove $args -y # >/dev/null
54
54
if [ " $distro_id " != " ID=fedora" ]; then
55
- apt-get autoremove -y 2> /dev/null
55
+ apt-get autoremove -y
56
56
fi
57
57
}
58
58
@@ -178,6 +178,8 @@ compile_assertions_finished () {
178
178
groupdel ${www_group} || true
179
179
done
180
180
repo-install httpd
181
+ grep -E ' nginx|apache' /etc/passwd
182
+ grep -E ' nginx|apache' /etc/group
181
183
run ./configure --with-domjudge-user=$u
182
184
assert_line " checking webserver-group... apache (detected)"
183
185
assert_line " * webserver group.....: apache"
Original file line number Diff line number Diff line change @@ -7,8 +7,14 @@ distro_id=$(grep "^ID=" /etc/os-release)
7
7
# Install everything for configure and testing
8
8
case $distro_id in
9
9
" ID=fedora" )
10
+ grep -E ' nginx|apache' /etc/passwd
11
+ grep -E ' nginx|apache' /etc/group
12
+
10
13
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
12
18
;;
13
19
* )
14
20
apt-get update; apt-get full-upgrade -y
@@ -27,4 +33,4 @@ make configure
27
33
cp submit/assert.bash .github/jobs/configure-checks/
28
34
29
35
# 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
You can’t perform that action at this time.
0 commit comments