From 2601b27f2d1b7a2f4a6ad266c9c8b505081fc7cf Mon Sep 17 00:00:00 2001 From: Jaap Eldering Date: Tue, 17 Sep 2024 13:58:47 +0200 Subject: [PATCH] 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. --- .github/jobs/configure-checks/all.bats | 2 +- .../configure-checks/setup_configure_image.sh | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/jobs/configure-checks/all.bats b/.github/jobs/configure-checks/all.bats index 207650895f..f2445ddb8d 100755 --- a/.github/jobs/configure-checks/all.bats +++ b/.github/jobs/configure-checks/all.bats @@ -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 diff --git a/.github/jobs/configure-checks/setup_configure_image.sh b/.github/jobs/configure-checks/setup_configure_image.sh index 6be3f188ef..4e8e859818 100755 --- a/.github/jobs/configure-checks/setup_configure_image.sh +++ b/.github/jobs/configure-checks/setup_configure_image.sh @@ -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 \ + php-fpm + ;; *) 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