Skip to content

Commit

Permalink
Pull in composer dependencies before running make tests
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
eldering committed Sep 18, 2024
1 parent 0d62cb0 commit 53521a8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/jobs/configure-checks/all.bats
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ compile_assertions_finished () {
@test "cgroup library needed" {
cgroup_init_find="checking for cgroup_init in -lcgroup... no"
cgroup_init_error="configure: error: Linux cgroup library not found."
setup_user
setup
repo-install gcc g++
repo-remove libcgroup-dev
run run_configure
Expand Down
15 changes: 11 additions & 4 deletions .github/jobs/configure-checks/setup_configure_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,23 @@ distro_id=$(grep "^ID=" /etc/os-release)
# Install everything for configure and testing
case $distro_id in
"ID=fedora")
dnf install pkg-config make bats autoconf automake util-linux -y ;;
dnf install -y pkg-config make bats autoconf automake util-linux \
httpd
;;
*)
apt-get update; apt-get full-upgrade -y
apt-get install pkg-config make bats autoconf -y ;;
apt-get install -y pkg-config make bats autoconf composer \
php-fpm php-gd php-cli php-intl php-mbstring php-mysql \
php-curl php-json php-xml php-zip
;;
esac

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

# Install extra assert statements for bots
# Install extra assert statements for bats
cp submit/assert.bash .github/jobs/configure-checks/

# Run the configure tests for this usecase
Expand Down

0 comments on commit 53521a8

Please sign in to comment.