run tests on php 8.5; refactor test env build scripts

Author: gggeek

.github/workflows/ci.yaml

@@ -24,6 +24,8 @@ jobs:
                 include:
                     # @see https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners
                     # @todo run some tests on 'windows-latest' (needs test env setup scripts for windows to be developed)
+                    -   php: '8.5'
+                        operating-system: ubuntu-24.04
                     -   php: '8.4'
                         operating-system: ubuntu-24.04
                         sslversion: 7

tests/ci/Dockerfile

@@ -1,17 +1,14 @@
-ARG UBUNTU_VERSION=focal
+ARG UBUNTU_VERSION=jammy
 
 FROM ubuntu:${UBUNTU_VERSION}
 
 ARG PHP_VERSION=default
-ARG UBUNTU_VERSION=focal
+ARG UBUNTU_VERSION=jammy
 
-COPY setup/*.sh /root/setup/
+COPY --chmod=755 setup/*.sh /root/setup/
 COPY config/* /root/config/
 
 RUN if [ ! -f /.dockerenv ]; then touch /.dockerenv; fi && \
-  mkdir -p /usr/share/man/man1 && \
-  apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y upgrade && \
-  chmod 755 /root/setup/*.sh && \
   cd /root/setup && \
   ./install_packages.sh && \
   ./create_user.sh && \
@@ -23,8 +20,7 @@ RUN if [ ! -f /.dockerenv ]; then touch /.dockerenv; fi && \
   echo "PHP_VERSION=${PHP_VERSION}" > /etc/build-info && \
   echo "UBUNTU_VERSION=${UBUNTU_VERSION}" >> /etc/build-info
 
-COPY docker/entrypoint.sh /root/entrypoint.sh
-RUN chmod 755 /root/entrypoint.sh
+COPY --chmod=755 docker/entrypoint.sh /root/entrypoint.sh
 
 EXPOSE 80 443 8080
 

tests/ci/matrix.sh

@@ -16,7 +16,7 @@ PHP_LIST_xenial=${PHP_LIST_xenial:-default 5.4}
 PHP_LIST_bionic=${PHP_LIST_bionic:-default 5.5}
 PHP_LIST_focal=${PHP_LIST_focal:-default 5.4}
 PHP_LIST_jammy=${PHP_LIST_jammy:-default 5.5 7.1 7.3 8.2 8.3}
-PHP_LIST_noble=${PHP_LIST_noble:-default 5.6 7.2 7.4 8.1 8.4}
+PHP_LIST_noble=${PHP_LIST_noble:-default 5.6 7.2 7.4 8.1 8.4 8.5}
 
 STARTING_HTTPPORT="${STARTING_HTTPPORT:-81}"
 STARTING_HTTPSPORT="${STARTING_HTTPSPORT:-444}"

tests/ci/setup/install_packages.sh

@@ -6,31 +6,20 @@ set -e
 
 echo "Installing base software packages..."
 
-# @todo allow optional updating of preinstalled sw
+# @todo make updating of preinstalled sw optional, so that f.e. we can have faster builds as part of CI
+
+export DEBIAN_FRONTEND=noninteractive
+
+if [ ! -d /usr/share/man/man1 ]; then mkdir -p /usr/share/man/man1; fi
 
 apt-get update
 
-# adduser is not preinstalled on noble
-DEBIAN_FRONTEND=noninteractive apt-get install -y \
+apt-get upgrade -y
+
+apt-get install -y \
     locales sudo unzip wget
 
 # We set up one locale which uses the comma as decimal separator. Used by the testsuite
 locale-gen de_DE de_DE.UTF-8
 
-# In case we will be using php5.x from shivammatur, it has a dependency on a lib missing from bionic
-# `lsb-release` is not necessarily onboard. We parse /etc/os-release instead
-DEBIAN_VERSION=$(grep 'VERSION_CODENAME=' /etc/os-release | sed 's/VERSION_CODENAME=//')
-if [ -z "${DEBIAN_VERSION}" ]; then
-    # Example strings:
-    # VERSION="14.04.6 LTS, Trusty Tahr"
-    # VERSION="18.04.6 LTS (Bionic Beaver)"
-    # VERSION="8 (jessie)"
-    DEBIAN_VERSION="$(grep 'VERSION=' /etc/os-release | sed 's/VERSION= *//' | sed 's/ *["0-9.,()]\+ *//g'| tr '[:upper:]' '[:lower:]' | sed 's/ *lts *//' | cut -d' ' -f 1)"
-fi
-if [ "$DEBIAN_VERSION" = bionic ]; then
-    wget https://launchpad.net/~ubuntu-security/+archive/ubuntu/ppa/+build/15108504/+files/libpng12-0_1.2.54-1ubuntu1.1_amd64.deb
-    dpkg --install libpng12-0_1.2.54-1ubuntu1.1_amd64.deb
-    rm libpng12-0_1.2.54-1ubuntu1.1_amd64.deb
-fi
-
 echo "Done installing base software packages"

tests/ci/setup/setup_apache.sh

@@ -2,15 +2,17 @@
 
 # Install and configure apache2
 # Has to be run as admin
-# @todo make this work across all ubuntu versions (precise to jammy)
+# @todo make this work across all ubuntu versions (precise to noble)
 
 echo "Installing and configuring Apache2..."
 
 set -e
 
 SCRIPT_DIR="$(dirname -- "$(readlink -f "$0")")"
 
-DEBIAN_FRONTEND=noninteractive apt-get install -y apache2
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get install -y apache2
 
 # set up Apache for php-fpm
 

tests/ci/setup/setup_composer.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Installs Composer (latest version, to avoid relying on old ones bundled with the OS)
-# @todo allow users to lock down to Composer v1 if needed
+# @todo allow users to lock down to Composer v1 or v2.2 if needed
 
 echo "Installing Composer..."