Skip to content

Commit 56df266

Browse files
vinceAmstoutzdunglas
authored andcommitted
ci: add PHP 8.5 support for building images
1 parent 1de9073 commit 56df266

1 file changed

Lines changed: 15 additions & 2 deletions

File tree

.github/workflows/docker.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ jobs:
4646
php_version: ${{ steps.check.outputs.php_version }}
4747
php82_version: ${{ steps.check.outputs.php82_version }}
4848
php83_version: ${{ steps.check.outputs.php83_version }}
49+
php84_version: ${{ steps.check.outputs.php84_version }}
50+
php85_version: ${{ steps.check.outputs.php85_version }}
4951
skip: ${{ steps.check.outputs.skip }}
5052
ref: ${{ steps.check.outputs.ref || (github.event_name == 'workflow_dispatch' && inputs.version) || '' }}
5153
steps:
@@ -57,11 +59,13 @@ jobs:
5759
PHP_82_LATEST=$(skopeo inspect docker://docker.io/library/php:8.2 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")')
5860
PHP_83_LATEST=$(skopeo inspect docker://docker.io/library/php:8.3 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")')
5961
PHP_84_LATEST=$(skopeo inspect docker://docker.io/library/php:8.4 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")')
62+
PHP_85_LATEST=$(skopeo inspect docker://docker.io/library/php:8.5-rc --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")')
6063
{
61-
echo php_version="${PHP_82_LATEST},${PHP_83_LATEST},${PHP_84_LATEST}"
64+
echo php_version="${PHP_82_LATEST},${PHP_83_LATEST},${PHP_84_LATEST},${PHP_85_LATEST}"
6265
echo php82_version="${PHP_82_LATEST//./-}"
6366
echo php83_version="${PHP_83_LATEST//./-}"
6467
echo php84_version="${PHP_84_LATEST//./-}"
68+
echo php85_version="${PHP_85_LATEST//./-}"
6569
} >> "${GITHUB_OUTPUT}"
6670
6771
# Check if the Docker images must be rebuilt
@@ -75,8 +79,9 @@ jobs:
7579
FRANKENPHP_82_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:"${FRANKENPHP_LATEST_TAG_NO_PREFIX}"-php8.2 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")')
7680
FRANKENPHP_83_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:"${FRANKENPHP_LATEST_TAG_NO_PREFIX}"-php8.3 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")')
7781
FRANKENPHP_84_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:"${FRANKENPHP_LATEST_TAG_NO_PREFIX}"-php8.4 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")')
82+
FRANKENPHP_85_LATEST=$(skopeo inspect docker://docker.io/dunglas/frankenphp:"${FRANKENPHP_LATEST_TAG_NO_PREFIX}"-php8.5 --override-os linux --override-arch amd64 | jq -r '.Env[] | select(test("^PHP_VERSION=")) | sub("^PHP_VERSION="; "")')
7883
79-
if [[ "${FRANKENPHP_82_LATEST}" == "${PHP_82_LATEST}" ]] && [[ "${FRANKENPHP_83_LATEST}" == "${PHP_83_LATEST}" ]] && [[ "${FRANKENPHP_84_LATEST}" == "${PHP_84_LATEST}" ]]; then
84+
if [[ "${FRANKENPHP_82_LATEST}" == "${PHP_82_LATEST}" ]] && [[ "${FRANKENPHP_83_LATEST}" == "${PHP_83_LATEST}" ]] && [[ "${FRANKENPHP_84_LATEST}" == "${PHP_84_LATEST}" ]] && [[ "${FRANKENPHP_85_LATEST}" == "${PHP_85_LATEST}" ]]; then
8085
echo skip=true >> "${GITHUB_OUTPUT}"
8186
exit 0
8287
fi
@@ -129,10 +134,18 @@ jobs:
129134
platform: linux/arm/v6
130135
- variant: php-${{ needs.prepare.outputs.php83_version }}-trixie
131136
platform: linux/arm/v6
137+
- variant: php-${{ needs.prepare.outputs.php84_version }}-trixie
138+
platform: linux/arm/v6
139+
- variant: php-${{ needs.prepare.outputs.php85_version }}-trixie
140+
platform: linux/arm/v6
132141
- variant: php-${{ needs.prepare.outputs.php82_version }}-bookworm
133142
platform: linux/arm/v6
134143
- variant: php-${{ needs.prepare.outputs.php83_version }}-bookworm
135144
platform: linux/arm/v6
145+
- variant: php-${{ needs.prepare.outputs.php84_version }}-bookworm
146+
platform: linux/arm/v6
147+
- variant: php-${{ needs.prepare.outputs.php85_version }}-bookworm
148+
platform: linux/arm/v6
136149
steps:
137150
- name: Prepare
138151
id: prepare

0 commit comments

Comments
 (0)