Skip to content

Commit

Permalink
Drop virtual provides from php module packages
Browse files Browse the repository at this point in the history
Some of the php modules had virtual provides. The intent of such
a thing would be so that a process could 'apk add php-amqp' and
get a sane result.

The implementation had a problem where by doing so would choose
whichever php-8.X-amqp version had the newest package version.
That is almost certainly _not_ what the process wanted (one day to get
php-8.2-ampq and the next to get php-8.1-ampq).

wolfi-dev#32874 describes the problem
and a solution. wolfi-dev#34680 implemented
that solution.  In the PR we realized that the provides were so
inconsistent that it would be had to use the. So then, given the
option of making them consistent or dropping them, we chose to drop
them.
  • Loading branch information
smoser committed Nov 20, 2024
1 parent 2a2b231 commit 5fff8c5
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 109 deletions.
5 changes: 1 addition & 4 deletions php-8.1-amqp.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: php-8.1-amqp
version: 2.1.2
epoch: 2
epoch: 3
description: "PHP extension to communicate with any AMQP compliant server"
copyright:
- license: PHP-3.01
Expand Down Expand Up @@ -51,9 +51,6 @@ pipeline:
subpackages:
- name: ${{package.name}}-config
dependencies:
provides:
- php-amqp-config=${{package.full-version}}
pipeline:
- runs: |
mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d"
Expand Down
10 changes: 2 additions & 8 deletions php-8.1-igbinary.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: php-8.1-igbinary
version: 3.2.16
epoch: 2
epoch: 3
description: "Igbinary is a drop in replacement for the standard php serializer."
copyright:
- license: BSD-3-Clause
Expand Down Expand Up @@ -49,19 +49,13 @@ pipeline:
subpackages:
- name: ${{package.name}}-config
dependencies:
provides:
- php-igbinary-config=${{package.full-version}}
pipeline:
- runs: |
mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d"
echo "extension=igbinary.so" > "${{targets.subpkgdir}}/etc/php/conf.d/igbinary.ini"
- name: ${{package.name}}-dev
description: PHP ${{vars.phpMM}} igbinary development headers
dependencies:
provides:
- php-igbinary-dev=${{package.full-version}}
description: "PHP ${{vars.phpMM}} igbinary development headers"
pipeline:
- uses: split/dev

Expand Down
10 changes: 2 additions & 8 deletions php-8.1-redis.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: php-8.1-redis
version: 6.1.0
epoch: 2
epoch: 3
description: "A PHP extension for Redis"
copyright:
- license: PHP-3.01
Expand Down Expand Up @@ -49,19 +49,13 @@ pipeline:
subpackages:
- name: ${{package.name}}-config
dependencies:
provides:
- php-redis-config=${{package.full-version}}
pipeline:
- runs: |
mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d"
echo "extension=redis.so" > "${{targets.subpkgdir}}/etc/php/conf.d/redis.ini"
- name: ${{package.name}}-dev
description: PHP ${{vars.phpMM}} redis development headers
dependencies:
provides:
- php-redis-dev=${{package.full-version}}
description: "PHP ${{vars.phpMM}} redis development headers"
pipeline:
- uses: split/dev

Expand Down
5 changes: 1 addition & 4 deletions php-8.2-amqp.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: php-8.2-amqp
version: 2.1.2
epoch: 2
epoch: 3
description: "PHP extension to communicate with any AMQP compliant server"
copyright:
- license: PHP-3.01
Expand Down Expand Up @@ -51,9 +51,6 @@ pipeline:
subpackages:
- name: ${{package.name}}-config
dependencies:
provides:
- php-amqp-config=${{package.full-version}}
pipeline:
- runs: |
mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d"
Expand Down
7 changes: 1 addition & 6 deletions php-8.3-amqp.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: php-8.3-amqp
version: 2.1.2
epoch: 2
epoch: 3
description: "PHP extension to communicate with any AMQP compliant server"
copyright:
- license: PHP-3.01
Expand All @@ -10,8 +10,6 @@ package:
- ${{package.name}}-config
- php-${{vars.phpMM}}
- rabbitmq-c
provides:
- php-amqp=${{package.full-version}}

var-transforms:
- from: ${{package.name}}
Expand Down Expand Up @@ -53,9 +51,6 @@ pipeline:
subpackages:
- name: ${{package.name}}-config
dependencies:
provides:
- php-amqp-config=${{package.full-version}}
pipeline:
- runs: |
mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d"
Expand Down
7 changes: 1 addition & 6 deletions php-8.3-apcu.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package:
name: php-8.3-apcu
version: 5.1.24
epoch: 1
epoch: 2
description: "PHP extension for User Cache"
copyright:
- license: PHP-3.01
dependencies:
runtime:
- ${{package.name}}-config
- php-${{vars.phpMM}}
provides:
- php-apcu=${{package.full-version}}

var-transforms:
- from: ${{package.name}}
Expand Down Expand Up @@ -48,9 +46,6 @@ pipeline:
subpackages:
- name: ${{package.name}}-config
dependencies:
provides:
- php-apcu-config=${{package.full-version}}
pipeline:
- runs: |
mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d"
Expand Down
9 changes: 2 additions & 7 deletions php-8.3-excimer.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package:
name: php-8.3-excimer
version: 1.2.3
epoch: 0
epoch: 1
description: "Excimer is a PHP extension that provides an interrupting timer and a low-overhead sampling profiler."
copyright:
- license: Apache-2.0
dependencies:
runtime:
- ${{package.name}}-config
- php-${{vars.phpMM}}
provides:
- php-excimer=${{package.full-version}}

var-transforms:
- from: ${{package.name}}
Expand All @@ -31,7 +29,7 @@ pipeline:
- uses: git-checkout
with:
repository: https://github.com/wikimedia/mediawiki-php-excimer
tag: "${{package.version}}"
tag: ${{package.version}}
expected-commit: c52285d4e29be23dfbf54591ed23ad822ec02de0

- name: Prepare build
Expand All @@ -51,9 +49,6 @@ pipeline:
subpackages:
- name: ${{package.name}}-config
dependencies:
provides:
- php-excimer-config=${{package.full-version}}
pipeline:
- runs: |
mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d"
Expand Down
7 changes: 1 addition & 6 deletions php-8.3-grpc.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: php-8.3-grpc
version: 1.68.0
epoch: 0
epoch: 1
description: "A PHP extension for gRPC"
copyright:
- license: Apache-2.0
Expand All @@ -10,8 +10,6 @@ package:
- ${{package.name}}-config
- grpc
- php-${{vars.phpMM}}
provides:
- php-grpc=${{package.full-version}}

var-transforms:
- from: ${{package.name}}
Expand Down Expand Up @@ -49,9 +47,6 @@ pipeline:
subpackages:
- name: ${{package.name}}-config
dependencies:
provides:
- php-grpc-config=${{package.full-version}}
pipeline:
- runs: |
mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d"
Expand Down
12 changes: 2 additions & 10 deletions php-8.3-igbinary.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package:
name: php-8.3-igbinary
version: 3.2.16
epoch: 2
epoch: 3
description: "Igbinary is a drop in replacement for the standard php serializer."
copyright:
- license: BSD-3-Clause
dependencies:
runtime:
- ${{package.name}}-config
- php-${{vars.phpMM}}
provides:
- php-igbinary=${{package.full-version}}

var-transforms:
- from: ${{package.name}}
Expand Down Expand Up @@ -51,19 +49,13 @@ pipeline:
subpackages:
- name: ${{package.name}}-config
dependencies:
provides:
- php-igbinary-config=${{package.full-version}}
pipeline:
- runs: |
mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d"
echo "extension=igbinary.so" > "${{targets.subpkgdir}}/etc/php/conf.d/igbinary.ini"
- name: ${{package.name}}-dev
description: PHP ${{vars.phpMM}} igbinary development headers
dependencies:
provides:
- php-igbinary-dev=${{package.full-version}}
description: "PHP ${{vars.phpMM}} igbinary development headers"
pipeline:
- uses: split/dev

Expand Down
9 changes: 2 additions & 7 deletions php-8.3-imagick.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: php-8.3-imagick
version: 3.7.0
epoch: 3
epoch: 4
description: "PHP extension for ImageMagick"
copyright:
- license: PHP-3.01
Expand All @@ -10,8 +10,6 @@ package:
- ${{package.name}}-config
- imagemagick
- php-${{vars.phpMM}}
provides:
- php-imagick=${{package.full-version}}

var-transforms:
- from: ${{package.name}}
Expand All @@ -33,7 +31,7 @@ pipeline:
- uses: git-checkout
with:
repository: https://github.com/Imagick/imagick
tag: "${{package.version}}"
tag: ${{package.version}}
expected-commit: 52ec37ff633de0e5cca159a6437b8c340afe7831

- name: Prepare build
Expand All @@ -50,9 +48,6 @@ pipeline:
subpackages:
- name: ${{package.name}}-config
dependencies:
provides:
- php-imagick-config=${{package.full-version}}
pipeline:
- runs: |
mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d"
Expand Down
14 changes: 3 additions & 11 deletions php-8.3-memcached.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package:
name: php-8.3-memcached
version: 3.3.0
epoch: 2
epoch: 3
description: "A PHP extension for Memcached"
copyright:
- license: PHP-3.01
dependencies:
runtime:
- ${{package.name}}-config
- php-${{vars.phpMM}}
provides:
- php-memcached=${{package.full-version}}

var-transforms:
- from: ${{package.name}}
Expand All @@ -34,7 +32,7 @@ pipeline:
- uses: git-checkout
with:
repository: https://github.com/php-memcached-dev/php-memcached
tag: v${{package.version}}
tag: "v${{package.version}}"
expected-commit: b0b82692d789a2a5fd95b3910e87f73615c0f918

- name: Prepare build
Expand All @@ -51,19 +49,13 @@ pipeline:
subpackages:
- name: ${{package.name}}-config
dependencies:
provides:
- php-memcached-config=${{package.full-version}}
pipeline:
- runs: |
mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d"
echo "extension=memcached.so" > "${{targets.subpkgdir}}/etc/php/conf.d/memcached.ini"
- name: ${{package.name}}-dev
description: PHP ${{vars.phpMM}} memcached development headers
dependencies:
provides:
- php-memcached-dev=${{package.full-version}}
description: "PHP ${{vars.phpMM}} memcached development headers"
pipeline:
- uses: split/dev

Expand Down
12 changes: 2 additions & 10 deletions php-8.3-msgpack.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package:
name: php-8.3-msgpack
version: 3.0.0
epoch: 2
epoch: 3
description: "A PHP extension for msgpack"
copyright:
- license: BSD-3-Clause
dependencies:
runtime:
- ${{package.name}}-config
- php-${{vars.phpMM}}
provides:
- php-msgpack=${{package.full-version}}

var-transforms:
- from: ${{package.name}}
Expand Down Expand Up @@ -49,19 +47,13 @@ pipeline:
subpackages:
- name: ${{package.name}}-config
dependencies:
provides:
- php-msgpack-config=${{package.full-version}}
pipeline:
- runs: |
mkdir -p "${{targets.subpkgdir}}/etc/php/conf.d"
echo "extension=msgpack.so" > "${{targets.subpkgdir}}/etc/php/conf.d/msgpack.ini"
- name: ${{package.name}}-dev
description: PHP ${{vars.phpMM}} msgpack development headers
dependencies:
provides:
- php-msgpack-dev=${{package.full-version}}
description: "PHP ${{vars.phpMM}} msgpack development headers"
pipeline:
- uses: split/dev

Expand Down
Loading

0 comments on commit 5fff8c5

Please sign in to comment.