Skip to content

Commit f6ce09f

Browse files
authored
Merge pull request #203 from usabilla/php8-4-alpine-3.22
Build php 8.4 on alpine 3.22
2 parents 651925e + b6f08a6 commit f6ce09f

File tree

4 files changed

+148
-1
lines changed

4 files changed

+148
-1
lines changed

.github/workflows/ci.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,12 @@ jobs:
234234
- php: "8.3"
235235
alpine: "3.20"
236236
type: "cli"
237+
- php: "8.4"
238+
alpine: "3.22"
239+
type: "cli"
240+
- php: "8.4"
241+
alpine: "3.22"
242+
type: "fpm"
237243
steps:
238244
- uses: actions/checkout@v2
239245
- run: ./build-php.sh ${{ matrix.type }} ${{ matrix.php }} ${{ matrix.alpine }}
@@ -336,6 +342,12 @@ jobs:
336342
- php: "8.3"
337343
alpine: "3.20"
338344
type: "cli"
345+
- php: "8.4"
346+
alpine: "3.22"
347+
type: "cli"
348+
- php: "8.4"
349+
alpine: "3.22"
350+
type: "fpm"
339351
steps:
340352
- uses: actions/checkout@v2
341353
- name: Install clair-scanner
@@ -494,6 +506,12 @@ jobs:
494506
- php: "8.3"
495507
alpine: "3.20"
496508
type: "cli"
509+
- php: "8.4"
510+
alpine: "3.22"
511+
type: "cli"
512+
- php: "8.4"
513+
alpine: "3.22"
514+
type: "fpm"
497515
steps:
498516
- uses: actions/checkout@v2
499517
- name: Download Images
@@ -716,6 +734,12 @@ jobs:
716734
- php: "8.3"
717735
alpine: "3.20"
718736
type: "cli"
737+
- php: "8.4"
738+
alpine: "3.22"
739+
type: "cli"
740+
- php: "8.4"
741+
alpine: "3.22"
742+
type: "fpm"
719743
steps:
720744
- uses: actions/checkout@v2
721745
- name: Download Images
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
3+
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
76+
sNinuiQPA0QDZA==
77+
=LArl
78+
-----END PGP PUBLIC KEY BLOCK-----
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
3+
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
35+
3+VuMOKtBdMJJz0gi4wrpXQE
36+
=NHL2
37+
-----END PGP PUBLIC KEY BLOCK-----

test/container/php/test_config.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import pytest
2+
import re
3+
from packaging import version
24

35
CONFIG_DIR = '/usr/local/etc/php'
46

@@ -47,7 +49,13 @@ def test_development_config_is_effective(host):
4749

4850
assert u'display_errors => STDOUT => STDOUT' in config
4951
assert u'display_startup_errors => On => On' in config
50-
assert u'error_reporting => 32767 => 32767' in config
52+
53+
php_version_string = (re.search(r'PHP Version => (\d+\.\d+\.\d+)', config)).group(1)
54+
php_version = version.parse(php_version_string)
55+
if php_version < version.parse("8.4.0"):
56+
assert u'error_reporting => 32767 => 32767' in config
57+
else:
58+
assert u'error_reporting => 30719 => 30719' in config
5159

5260
@pytest.mark.php_cli
5361
def test_cli_configuration_is_effective(host):

0 commit comments

Comments
 (0)