Skip to content

Commit 4040c2b

Browse files
committed
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 42e6d49 commit 4040c2b

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ setup() {
3737
if [ "$distro_id" = "ID=fedora" ]; then
3838
repo-install httpd
3939
fi
40-
repo-install gcc g++ libcgroup-dev composer
40+
repo-install gcc g++ libcgroup-dev
4141
}
4242

4343
run_configure () {

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

+13-5
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,24 @@ 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+
composer httpd php-fpm php-gd php-cli php-intl php-mbstring \
12+
php-mysqlnd php-xml php-zip
13+
;;
1114
*)
1215
apt-get update; apt-get full-upgrade -y
13-
apt-get install pkg-config make bats autoconf -y ;;
16+
apt-get install -y pkg-config make bats autoconf composer \
17+
php-fpm php-gd php-cli php-intl php-mbstring php-mysql \
18+
php-curl php-json php-xml php-zip
19+
;;
1420
esac
1521

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

19-
# Install extra assert statements for bots
27+
# Install extra assert statements for bats
2028
cp submit/assert.bash .github/jobs/configure-checks/
2129

2230
# Run the configure tests for this usecase

0 commit comments

Comments
 (0)