Skip to content

Commit 7a4143a

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 7a4143a

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@ 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 pkg-config make bats autoconf automake util-linux composer -y ;;
1111
*)
1212
apt-get update; apt-get full-upgrade -y
13-
apt-get install pkg-config make bats autoconf -y ;;
13+
apt-get install pkg-config make bats autoconf composer -y ;;
1414
esac
1515

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

19-
# Install extra assert statements for bots
21+
# Install extra assert statements for bats
2022
cp submit/assert.bash .github/jobs/configure-checks/
2123

2224
# Run the configure tests for this usecase

0 commit comments

Comments
 (0)