Skip to content

Commit e5d270b

Browse files
authored
8.5.0RC1 (#165)
1 parent 614d1db commit e5d270b

File tree

3 files changed

+93
-26
lines changed

3 files changed

+93
-26
lines changed

.github/workflows/buildx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
run: |
5656
USE_VERSION=$PHP_VERSION
5757
if [ "$PHP_VERSION" == "8.5" ]; then
58-
USE_VERSION="8.5.0alpha2"
58+
USE_VERSION="8.5.0RC1"
5959
fi
6060
echo "name=$USE_VERSION" >> "$GITHUB_OUTPUT"
6161
- name: Build and push Docker image

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if: matrix.php-version == '8.5'
4444
run: docker build -t php-base --build-arg PHP_VERSION=$PHP_VERSION .
4545
env:
46-
PHP_VERSION: '8.5.0alpha2'
46+
PHP_VERSION: '8.5.0RC1'
4747

4848
- name: Output modules
4949
run: docker run php-base php -m

php-install.sh

Lines changed: 91 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,43 @@ case $PHP_VERSION in
5252
yes | pecl install ds-1.4.0
5353
;;
5454
*)
55-
yes | pecl install ds
55+
# If we really need it.
56+
php -m | grep -q '^ds$' || yes | pecl install ds
5657
;;
5758
esac
5859

59-
yes | pecl install apcu igbinary rdkafka yaml decimal uuid msgpack mailparse
60+
case $PHP_VERSION in
61+
8.5*)
62+
php -m | grep -q '^igbinary$' || \
63+
(git clone --depth=1 https://github.com/igbinary/igbinary.git /usr/src/igbinary; \
64+
cd /usr/src/igbinary; \
65+
phpize && ./configure && make -j"$(nproc)" && make install; \
66+
echo "extension=igbinary.so" > /usr/local/etc/php/conf.d/igbinary.ini; \
67+
cd -; \
68+
rm -rf /usr/src/igbinary)
69+
;;
70+
*)
71+
yes | pecl install igbinary
72+
;;
73+
esac
74+
75+
case $PHP_VERSION in
76+
8.5*)
77+
# Yknow if we really need it.
78+
php -m | grep -q '^mailparse$' || \
79+
(git clone --depth=1 https://github.com/php/pecl-mail-mailparse.git /usr/src/mailparse; \
80+
cd /usr/src/mailparse; \
81+
phpize && ./configure && make -j"$(nproc)" && make install; \
82+
echo "extension=mailparse.so" > /usr/local/etc/php/conf.d/mailparse.ini; \
83+
cd -; \
84+
rm -rf /usr/src/mailparse)
85+
;;
86+
*)
87+
yes | pecl install mailparse
88+
;;
89+
esac
90+
91+
yes | pecl install apcu rdkafka yaml decimal uuid msgpack
6092

6193
case $PHP_VERSION in
6294
8.5*)
@@ -96,6 +128,15 @@ case $PHP_VERSION in
96128
esac
97129

98130
case $PHP_VERSION in
131+
8.5*)
132+
php -m | grep -q '^redis$' || \
133+
(git clone --depth=1 https://github.com/phpredis/phpredis.git /usr/src/phpredis; \
134+
cd /usr/src/phpredis; \
135+
phpize && ./configure && make -j"$(nproc)" && make install; \
136+
echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini; \
137+
cd -; \
138+
rm -rf /usr/src/phpredis)
139+
;;
99140
8.*)
100141
mkdir -p /usr/src/php/ext/redis && curl -fsSL https://pecl.php.net/get/redis | tar xvz -C "/usr/src/php/ext/redis" --strip 1 && docker-php-ext-install redis
101142
;;
@@ -105,9 +146,11 @@ case $PHP_VERSION in
105146
;;
106147
esac
107148

108-
docker-php-ext-configure intl
109-
docker-php-ext-configure gettext
110-
docker-php-ext-install intl gettext sockets
149+
php -m | grep -q '^intl$' || docker-php-ext-configure intl
150+
php -m | grep -q '^gettext$' || docker-php-ext-configure gettext
151+
php -m | grep -q '^intl$' || docker-php-ext-install intl
152+
php -m | grep -q '^gettext$' || docker-php-ext-install gettext
153+
php -m | grep -q '^sockets$' || docker-php-ext-install sockets
111154
docker-php-ext-enable ds yaml decimal uuid mailparse msgpack
112155

113156
case $PHP_VERSION in
@@ -155,21 +198,45 @@ case $PHP_VERSION in
155198
;;
156199
esac
157200

158-
yes | pecl install imagick
201+
case $PHP_VERSION in
202+
8.5*)
203+
php -m | grep -q '^imagick$' || \
204+
(git clone --depth=1 https://github.com/Imagick/imagick.git /usr/src/imagick; \
205+
cd /usr/src/imagick; \
206+
phpize && ./configure && make -j"$(nproc)" && make install; \
207+
echo "extension=imagick.so" > /usr/local/etc/php/conf.d/imagick.ini; \
208+
cd -; \
209+
rm -rf /usr/src/imagick)
210+
;;
211+
*)
212+
yes | pecl install imagick
213+
;;
214+
esac
215+
159216
docker-php-ext-enable imagick
160217

161218
case $PHP_VERSION in
162219
8.4*|8.5*)
163220
apk add --no-cache krb5-dev
164-
yes | pecl install imap
221+
# If we really need it.
222+
php -m | grep -q '^imap$' || yes | pecl install imap
165223
docker-php-ext-enable imap
166224
;;
167225
*)
168226
docker-php-ext-install imap
169227
;;
170228
esac
171229

172-
docker-php-ext-install gmp ldap xsl mysqli calendar gd pdo_mysql pdo_pgsql zip opcache bcmath soap exif bz2 pcntl
230+
case $PHP_VERSION in
231+
8.5*)
232+
echo "Skipping opcache for PHP $PHP_VERSION"
233+
;;
234+
*)
235+
docker-php-ext-install opcache
236+
;;
237+
esac
238+
239+
docker-php-ext-install gmp ldap xsl mysqli calendar gd pdo_mysql pdo_pgsql zip bcmath soap exif bz2 pcntl
173240
docker-php-ext-enable rdkafka apcu
174241

175242
mkdir ~/.ssh/
@@ -183,22 +250,22 @@ git clone https://github.com/violinist-dev/drupal-contrib-sa /root/drupal-contri
183250

184251
machine=`uname -m 2>/dev/null || /usr/bin/uname -m`
185252
case ${machine} in
186-
arm|armv7*)
187-
machine="arm"
188-
;;
189-
aarch64*|armv8*)
190-
machine="arm64"
191-
;;
192-
i386)
193-
machine="386"
194-
;;
195-
x86_64)
196-
machine="amd64"
197-
;;
198-
*)
199-
output " [ ] You architecture (${machine}) is not currently supported" "error"
200-
exit 1
201-
;;
253+
arm|armv7*)
254+
machine="arm"
255+
;;
256+
aarch64*|armv8*)
257+
machine="arm64"
258+
;;
259+
i386)
260+
machine="386"
261+
;;
262+
x86_64)
263+
machine="amd64"
264+
;;
265+
*)
266+
output " [ ] You architecture (${machine}) is not currently supported" "error"
267+
exit 1
268+
;;
202269
esac
203270

204271
wget https://github.com/symfony/cli/releases/download/v4.16.3/symfony_linux_${machine}.gz -O /tmp/symfony.gz

0 commit comments

Comments
 (0)