use a variable for php version (phpMM) and utilize pipelines in php f…

…iles. (#32344) Update the php-8.*-*.yaml files to have use a var transform based on package name for the php version, and then use replace any use of php version with that variable. Also here: * drop a comment that causes issue with wolfictl bump wolfi-dev/wolfictl#1282 * update to use pecl/install and pecl/phpize pipeline where possible * update php8.*-redis.yaml to use phpMM name, as it had already used php-version.
wolfi-dev · Oct 30, 2024 · e0dda80 · e0dda80
1 parent 0a1d933
commit e0dda80
Show file tree

Hide file tree

Showing 75 changed files with 789 additions and 420 deletions.
diff --git a/php-8.1-amqp.yaml b/php-8.1-amqp.yaml
@@ -1,24 +1,30 @@
 package:
   name: php-8.1-amqp
   version: 2.1.2
-  epoch: 1
+  epoch: 2
   description: "PHP extension to communicate with any AMQP compliant server"
   copyright:
     - license: PHP-3.01
   dependencies:
     runtime:
       - ${{package.name}}-config
-      - php-8.1
+      - php-${{vars.phpMM}}
       - rabbitmq-c
 
+var-transforms:
+  - from: ${{package.name}}
+    match: ^php-(\d+\.\d+)-.*$
+    replace: "$1"
+    to: phpMM
+
 environment:
   contents:
     packages:
       - autoconf
       - build-base
       - busybox
-      - php-8.1
-      - php-8.1-dev
+      - php-${{vars.phpMM}}
+      - php-${{vars.phpMM}}-dev
       - rabbitmq-c-dev
 
 pipeline:

diff --git a/php-8.1-apcu.yaml b/php-8.1-apcu.yaml
@@ -1,23 +1,29 @@
 package:
   name: php-8.1-apcu
   version: 5.1.24
-  epoch: 0
+  epoch: 1
   description: "PHP extension for User Cache"
   copyright:
     - license: PHP-3.01
   dependencies:
     runtime:
       - ${{package.name}}-config
-      - php-8.1
+      - php-${{vars.phpMM}}
+
+var-transforms:
+  - from: ${{package.name}}
+    match: ^php-(\d+\.\d+)-.*$
+    replace: "$1"
+    to: phpMM
 
 environment:
   contents:
     packages:
       - autoconf
       - build-base
       - busybox
-      - php-8.1
-      - php-8.1-dev
+      - php-${{vars.phpMM}}
+      - php-${{vars.phpMM}}-dev
 
 pipeline:
   - uses: git-checkout

diff --git a/php-8.1-ddtrace.yaml b/php-8.1-ddtrace.yaml
@@ -1,14 +1,20 @@
 package:
   name: php-8.1-ddtrace
   version: 1.4.2
-  epoch: 1
+  epoch: 2
   description: "Datadog PHP Clients"
   copyright:
     - license: Apache-2.0 OR BSD-3-Clause
   dependencies:
     runtime:
       - ${{package.name}}-config
-      - php-8.1
+      - php-${{vars.phpMM}}
+
+var-transforms:
+  - from: ${{package.name}}
+    match: ^php-(\d+\.\d+)-.*$
+    replace: "$1"
+    to: phpMM
 
 environment:
   contents:
@@ -18,8 +24,8 @@ environment:
       - busybox
       - curl-dev
       - openssf-compiler-options
-      - php-8.1
-      - php-8.1-dev
+      - php-${{vars.phpMM}}
+      - php-${{vars.phpMM}}-dev
       - posix-libc-utils
       - rust
 
@@ -53,7 +59,7 @@ test:
   environment:
     contents:
       packages:
-        - php-8.1
+        - php-${{vars.phpMM}}
   pipeline:
     - name: Verify Extension is Loaded
       runs: |

diff --git a/php-8.1-decimal.yaml b/php-8.1-decimal.yaml
@@ -1,14 +1,20 @@
 package:
   name: php-8.1-decimal
   version: 1.5.0
-  epoch: 0
+  epoch: 1
   description: Correctly-rounded, arbitrary-precision decimal arithmetic for PHP
   copyright:
     - license: MIT
   dependencies:
     runtime:
       - ${{package.name}}-config
-      - php-8.1
+      - php-${{vars.phpMM}}
+
+var-transforms:
+  - from: ${{package.name}}
+    match: ^php-(\d+\.\d+)-.*$
+    replace: "$1"
+    to: phpMM
 
 environment:
   contents:
@@ -17,8 +23,8 @@ environment:
       - build-base
       - busybox
       - mpdecimal-dev
-      - php-8.1
-      - php-8.1-dev
+      - php-${{vars.phpMM}}
+      - php-${{vars.phpMM}}-dev
 
 pipeline:
   - uses: git-checkout

diff --git a/php-8.1-ds.yaml b/php-8.1-ds.yaml
@@ -1,23 +1,29 @@
 package:
   name: php-8.1-ds
   version: 1.5.0
-  epoch: 0
+  epoch: 1
   description: "An extension providing efficient data structures for PHP"
   copyright:
     - license: MIT
   dependencies:
     runtime:
       - ${{package.name}}-config
-      - php-8.1
+      - php-${{vars.phpMM}}
+
+var-transforms:
+  - from: ${{package.name}}
+    match: ^php-(\d+\.\d+)-.*$
+    replace: "$1"
+    to: phpMM
 
 environment:
   contents:
     packages:
       - autoconf
       - build-base
       - busybox
-      - php-8.1
-      - php-8.1-dev
+      - php-${{vars.phpMM}}
+      - php-${{vars.phpMM}}-dev
 
 pipeline:
   - uses: git-checkout

diff --git a/php-8.1-excimer.yaml b/php-8.1-excimer.yaml
@@ -1,23 +1,29 @@
 package:
   name: php-8.1-excimer
   version: 1.2.2
-  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-8.1
+      - php-${{vars.phpMM}}
+
+var-transforms:
+  - from: ${{package.name}}
+    match: ^php-(\d+\.\d+)-.*$
+    replace: "$1"
+    to: phpMM
 
 environment:
   contents:
     packages:
       - autoconf
       - build-base
       - busybox
-      - php-8.1
-      - php-8.1-dev
+      - php-${{vars.phpMM}}
+      - php-${{vars.phpMM}}-dev
 
 pipeline:
   - uses: git-checkout

diff --git a/php-8.1-grpc.yaml b/php-8.1-grpc.yaml
@@ -1,15 +1,21 @@
 package:
   name: php-8.1-grpc
   version: 1.67.1
-  epoch: 0
+  epoch: 1
   description: "A PHP extension for gRPC"
   copyright:
     - license: Apache-2.0
   dependencies:
     runtime:
       - ${{package.name}}-config
       - grpc
-      - php-8.1
+      - php-${{vars.phpMM}}
+
+var-transforms:
+  - from: ${{package.name}}
+    match: ^php-(\d+\.\d+)-.*$
+    replace: "$1"
+    to: phpMM
 
 environment:
   contents:
@@ -18,8 +24,8 @@ environment:
       - build-base
       - busybox
       - grpc-dev
-      - php-8.1
-      - php-8.1-dev
+      - php-${{vars.phpMM}}
+      - php-${{vars.phpMM}}-dev
 
 pipeline:
   - uses: git-checkout

diff --git a/php-8.1-igbinary.yaml b/php-8.1-igbinary.yaml
@@ -1,23 +1,29 @@
 package:
   name: php-8.1-igbinary
   version: 3.2.16
-  epoch: 0
+  epoch: 1
   description: "Igbinary is a drop in replacement for the standard php serializer."
   copyright:
     - license: BSD-3-Clause
   dependencies:
     runtime:
       - ${{package.name}}-config
-      - php-8.1
+      - php-${{vars.phpMM}}
+
+var-transforms:
+  - from: ${{package.name}}
+    match: ^php-(\d+\.\d+)-.*$
+    replace: "$1"
+    to: phpMM
 
 environment:
   contents:
     packages:
       - autoconf
       - build-base
       - busybox
-      - php-8.1
-      - php-8.1-dev
+      - php-${{vars.phpMM}}
+      - php-${{vars.phpMM}}-dev
 
 pipeline:
   - uses: git-checkout

diff --git a/php-8.1-imagick.yaml b/php-8.1-imagick.yaml
@@ -1,15 +1,21 @@
 package:
   name: php-8.1-imagick
   version: 3.7.0
-  epoch: 1
+  epoch: 2
   description: "PHP extension for ImageMagick"
   copyright:
     - license: PHP-3.01
   dependencies:
     runtime:
       - ${{package.name}}-config
       - imagemagick
-      - php-8.1
+      - php-${{vars.phpMM}}
+
+var-transforms:
+  - from: ${{package.name}}
+    match: ^php-(\d+\.\d+)-.*$
+    replace: "$1"
+    to: phpMM
 
 environment:
   contents:
@@ -18,8 +24,8 @@ environment:
       - build-base
       - busybox
       - imagemagick-dev
-      - php-8.1
-      - php-8.1-dev
+      - php-${{vars.phpMM}}
+      - php-${{vars.phpMM}}-dev
 
 pipeline:
   - uses: git-checkout

diff --git a/php-8.1-memcached.yaml b/php-8.1-memcached.yaml
@@ -1,14 +1,20 @@
 package:
   name: php-8.1-memcached
   version: 3.3.0
-  epoch: 0
+  epoch: 1
   description: "A PHP extension for Memcached"
   copyright:
     - license: PHP-3.01
   dependencies:
     runtime:
       - ${{package.name}}-config
-      - php-8.1
+      - php-${{vars.phpMM}}
+
+var-transforms:
+  - from: ${{package.name}}
+    match: ^php-(\d+\.\d+)-.*$
+    replace: "$1"
+    to: phpMM
 
 environment:
   contents:
@@ -17,9 +23,9 @@ environment:
       - build-base
       - busybox
       - libmemcached-dev
-      - php-8.1
-      - php-8.1-dev
-      - php-8.1-igbinary-dev
+      - php-${{vars.phpMM}}
+      - php-${{vars.phpMM}}-dev
+      - php-${{vars.phpMM}}-igbinary-dev
       - zlib-dev
 
 pipeline:

diff --git a/php-8.1-msgpack.yaml b/php-8.1-msgpack.yaml
@@ -1,23 +1,29 @@
 package:
   name: php-8.1-msgpack
   version: 3.0.0
-  epoch: 0
+  epoch: 1
   description: "A PHP extension for msgpack"
   copyright:
     - license: BSD-3-Clause
   dependencies:
     runtime:
       - ${{package.name}}-config
-      - php-8.1
+      - php-${{vars.phpMM}}
+
+var-transforms:
+  - from: ${{package.name}}
+    match: ^php-(\d+\.\d+)-.*$
+    replace: "$1"
+    to: phpMM
 
 environment:
   contents:
     packages:
       - autoconf
       - build-base
       - busybox
-      - php-8.1
-      - php-8.1-dev
+      - php-${{vars.phpMM}}
+      - php-${{vars.phpMM}}-dev
 
 pipeline:
   - uses: git-checkout