From 7876c61df5d40a92bb81dcd8c4458e12e095a20d 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 | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/jobs/configure-checks/all.bats b/.github/jobs/configure-checks/all.bats index 207650895fe..e00cd656e66 100755 --- a/.github/jobs/configure-checks/all.bats +++ b/.github/jobs/configure-checks/all.bats @@ -37,7 +37,7 @@ setup() { if [ "$distro_id" = "ID=fedora" ]; then repo-install httpd fi - repo-install gcc g++ libcgroup-dev composer + repo-install gcc g++ libcgroup-dev } run_configure () { diff --git a/.github/jobs/configure-checks/setup_configure_image.sh b/.github/jobs/configure-checks/setup_configure_image.sh index 6be3f188efc..0f57571f839 100755 --- a/.github/jobs/configure-checks/setup_configure_image.sh +++ b/.github/jobs/configure-checks/setup_configure_image.sh @@ -7,16 +7,24 @@ 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 composer \ + php-gd php-cli php-intl php-mbstring php-mysqlnd php-fpm \ + php-xml php-zip + ;; *) 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 -make configure +# 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 composer-dependencies -# 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