diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2023-02-08 12:10:26 +0000 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2023-02-08 12:24:57 +0000 |
| commit | 15e9daac6c8c8cd824448dd90d5ab3a567913801 (patch) | |
| tree | e16661f0fc6b43ae2707632f17a3c05b19acd13d | |
| parent | ff239cf5bf5263b1c72a80e5e95963acd57f5a44 (diff) | |
| download | libvirt-ci-15e9daac6c8c8cd824448dd90d5ab3a567913801.zip libvirt-ci-15e9daac6c8c8cd824448dd90d5ab3a567913801.tar.gz libvirt-ci-15e9daac6c8c8cd824448dd90d5ab3a567913801.tar.bz2 | |
facts: adapt to Alpine change from php8 to php81
In Alpine 3.16, there are php81 packages in parallel with php8
In Alpine Edge, there are php82 packages in parallel with php81,
and no php8.
We can't use the php82 packages yet, however, since the pecl-imagick
package isn't available.
So this switches to the php81 stack for 3.16 and Edge. Edge will
need updating again to php82 when it is fully available.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | lcitool/facts/mappings.yml | 6 | ||||
| -rw-r--r-- | tests/data/formatters/out/alpine-316-all-projects.Dockerfile | 2 | ||||
| -rw-r--r-- | tests/data/formatters/out/alpine-edge-all-projects.Dockerfile | 2 | ||||
| -rw-r--r-- | tests/data/packages/out/alpine-316.yml | 4 | ||||
| -rw-r--r-- | tests/data/packages/out/alpine-edge.yml | 4 |
5 files changed, 10 insertions, 8 deletions
diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml index a36fdde..9e86ab2 100644 --- a/lcitool/facts/mappings.yml +++ b/lcitool/facts/mappings.yml @@ -1607,17 +1607,19 @@ mappings: OpenSUSE: php: - apk: php8-dev + apk: php81-dev deb: php-dev pkg: php74 rpm: php-devel + Alpine315: php8-dev php-imagick: - apk: php8-pecl-imagick + apk: php81-pecl-imagick deb: php-imagick pkg: php74-pecl-imagick Fedora: php-pecl-imagick OpenSUSE: php-imagick + Alpine315: php8-pecl-imagick pixman: default: pixman diff --git a/tests/data/formatters/out/alpine-316-all-projects.Dockerfile b/tests/data/formatters/out/alpine-316-all-projects.Dockerfile index 077eace..cb4eae3 100644 --- a/tests/data/formatters/out/alpine-316-all-projects.Dockerfile +++ b/tests/data/formatters/out/alpine-316-all-projects.Dockerfile @@ -155,7 +155,7 @@ RUN apk update && \ perl-xml-writer \ perl-xml-xpath \ perl-yaml \ - php8-dev \ + php81-dev \ pixman-dev \ pkgconf \ polkit \ diff --git a/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile b/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile index 0d0f752..f9a66d4 100644 --- a/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile +++ b/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile @@ -155,7 +155,7 @@ RUN apk update && \ perl-xml-writer \ perl-xml-xpath \ perl-yaml \ - php8-dev \ + php81-dev \ pixman-dev \ pkgconf \ polkit \ diff --git a/tests/data/packages/out/alpine-316.yml b/tests/data/packages/out/alpine-316.yml index a838136..c0adbf9 100644 --- a/tests/data/packages/out/alpine-316.yml +++ b/tests/data/packages/out/alpine-316.yml @@ -174,8 +174,8 @@ native: - perl-xml-writer - perl-xml-xpath - perl-yaml -- php8-dev -- php8-pecl-imagick +- php81-dev +- php81-pecl-imagick - pixman-dev - pkgconf - polkit diff --git a/tests/data/packages/out/alpine-edge.yml b/tests/data/packages/out/alpine-edge.yml index a838136..c0adbf9 100644 --- a/tests/data/packages/out/alpine-edge.yml +++ b/tests/data/packages/out/alpine-edge.yml @@ -174,8 +174,8 @@ native: - perl-xml-writer - perl-xml-xpath - perl-yaml -- php8-dev -- php8-pecl-imagick +- php81-dev +- php81-pecl-imagick - pixman-dev - pkgconf - polkit |