Skip to content

Commit 8167ce9

Browse files
committed
one more try to make php 8.5 test setup work
1 parent dcc808b commit 8167ce9

1 file changed

Lines changed: 35 additions & 30 deletions

File tree

tests/ci/setup/setup_php.sh

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -108,37 +108,42 @@ install_shivammatur() {
108108
# @todo check if this script works with all php versions from 5.6 onwards
109109
# @todo the amount of cleanup and hacks required to get shivammathur/php-ubuntu working is huge. Can we find a better installer?
110110

111-
# @todo this set of packages has only been tested on Noble so far (it should work on Jammy too)
112-
echo "Using PHP from shivammathur/php-ubuntu..."
113-
if [ "${DEBIAN_VERSION}" = noble ]; then
114-
PACKAGES="gir1.2-girepository-2.0 libelf1t64 libglib2.0-0t64"
115-
else
116-
# @todo add also gir1.2-girepository-2.0 - check if name/availability is the same as on noble.
117-
PACKAGES="libelf1 libglib2.0-0"
111+
# @todo Fix - some of these packages create issues on GHA ubuntu containers...
112+
if [ -z "${GITHUB_ACTIONS}" ]; then
113+
# @todo this set of packages has only been tested on Noble so far (it should work on Jammy too)
114+
echo "Using PHP from shivammathur/php-ubuntu..."
115+
if [ "${DEBIAN_VERSION}" = noble ]; then
116+
PACKAGES="gir1.2-girepository-2.0 libelf1t64 libglib2.0-0t64"
117+
else
118+
# @todo add also gir1.2-girepository-2.0 - check if name/availability is the same as on noble.
119+
PACKAGES="libelf1 libglib2.0-0"
120+
fi
121+
122+
# Most of these tools are used by the `sudo update-alternatives` part in the install.sh script, and
123+
# will be downloaded at that time, along with some ominous warnings.
124+
# We are just as good preinstalling them anyway.
125+
126+
apt-get install -y \
127+
autoconf \
128+
automake \
129+
autotools-dev \
130+
build-essential \
131+
curl \
132+
icu-devtools \
133+
libargon2-1 \
134+
libgirepository-1.0-1 \
135+
libicu-dev \
136+
libltdl7 \
137+
libonig5 \
138+
libsodium23 \
139+
libxml2-dev \
140+
pkg-config \
141+
python3 \
142+
python3-apt \
143+
systemd-standalone-tmpfiles \
144+
zlib1g-dev \
145+
zstd $PACKAGES
118146
fi
119-
# Most of these tools are used by the `sudo update-alternatives` part in the install.sh script, and
120-
# will be downloaded at that time, along with some ominous warnings.
121-
# We are just as good preinstalling them anyway.
122-
apt-get install -y \
123-
autoconf \
124-
automake \
125-
autotools-dev \
126-
build-essential \
127-
curl \
128-
icu-devtools \
129-
libargon2-1 \
130-
libgirepository-1.0-1 \
131-
libicu-dev \
132-
libltdl7 \
133-
libonig5 \
134-
libsodium23 \
135-
libxml2-dev \
136-
pkg-config \
137-
python3 \
138-
python3-apt \
139-
systemd-standalone-tmpfiles \
140-
zlib1g-dev \
141-
zstd $PACKAGES
142147

143148
set +e
144149
curl -sSL https://github.com/shivammathur/php-ubuntu/releases/latest/download/install.sh | bash -s "${PHP_VERSION}"

0 commit comments

Comments
 (0)