Skip to content

Commit 53521a8

Browse files
committedSep 18, 2024·
Pull in composer dependencies before running make tests
This is because Makefiles implicitly depend on a distributed tarball (or initialized maintainer/inplace install). Running `make dist` would be a bit too much, so take this shortcut.
1 parent 0d62cb0 commit 53521a8

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed
 

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ compile_assertions_finished () {
210210
@test "cgroup library needed" {
211211
cgroup_init_find="checking for cgroup_init in -lcgroup... no"
212212
cgroup_init_error="configure: error: Linux cgroup library not found."
213-
setup_user
213+
setup
214214
repo-install gcc g++
215215
repo-remove libcgroup-dev
216216
run run_configure

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

+11-4
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,23 @@ distro_id=$(grep "^ID=" /etc/os-release)
77
# Install everything for configure and testing
88
case $distro_id in
99
"ID=fedora")
10-
dnf install pkg-config make bats autoconf automake util-linux -y ;;
10+
dnf install -y pkg-config make bats autoconf automake util-linux \
11+
httpd
12+
;;
1113
*)
1214
apt-get update; apt-get full-upgrade -y
13-
apt-get install pkg-config make bats autoconf -y ;;
15+
apt-get install -y pkg-config make bats autoconf composer \
16+
php-fpm php-gd php-cli php-intl php-mbstring php-mysql \
17+
php-curl php-json php-xml php-zip
18+
;;
1419
esac
1520

16-
# Build the configure file
21+
# Start from a configured, distribution-ready source tree. Ideally,
22+
# we'd like to call `make dist` but that depends on LaTeX for building
23+
# the documentation, so take a shortcut.
1724
make configure
1825

19-
# Install extra assert statements for bots
26+
# Install extra assert statements for bats
2027
cp submit/assert.bash .github/jobs/configure-checks/
2128

2229
# Run the configure tests for this usecase

0 commit comments

Comments
 (0)
Please sign in to comment.