Use php pecl/install action as suggested by TODO

smoser · Oct 30, 2024 · 21e4a06 · 21e4a06
1 parent c927d98
commit 21e4a06
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 96 deletions.
diff --git a/php-8.1-pecl-http.yaml b/php-8.1-pecl-http.yaml
@@ -39,14 +39,9 @@ pipeline:
 
   - uses: autoconf/make
 
-  # TODO: This is a temporary workaround until the pecl/install pipelines
-  # propagates through.
-  # https://github.com/chainguard-dev/melange/pull/1068
-  - name: Install
-    runs: |
-      make INSTALL_ROOT="${{targets.destdir}}" install
-      install -d ${{targets.destdir}}/etc/php/conf.d
-      echo "extension=http.so" > ${{targets.destdir}}/etc/php/conf.d/http.ini
+  - uses: pecl/install
+    with:
+      extension: "http"
 
   - uses: strip
 

diff --git a/php-8.1-pecl-pdosqlsrv.yaml b/php-8.1-pecl-pdosqlsrv.yaml
@@ -35,14 +35,9 @@ pipeline:
 
   - uses: autoconf/make
 
-  # TODO: This is a temporary workaround until the pecl/install pipelines
-  # propagates through.
-  # https://github.com/chainguard-dev/melange/pull/1068
-  - name: Install
-    runs: |
-      make INSTALL_ROOT="${{targets.destdir}}" install
-      install -d ${{targets.destdir}}/etc/php/conf.d
-      echo "extension=pdo_sqlsrv.so" > ${{targets.destdir}}/etc/php/conf.d/pdo_sqlsrv.ini
+  - uses: pecl/install
+    with:
+      extension: "pdo_sqlsrv"
 
   - uses: strip
 

diff --git a/php-8.1-pecl-raphf.yaml b/php-8.1-pecl-raphf.yaml
@@ -34,14 +34,9 @@ pipeline:
 
   - uses: autoconf/make
 
-  # TODO: This is a temporary workaround until the pecl/install pipelines
-  # propagates through.
-  # https://github.com/chainguard-dev/melange/pull/1068
-  - name: Install
-    runs: |
-      make INSTALL_ROOT="${{targets.destdir}}" install
-      install -d ${{targets.destdir}}/etc/php/conf.d
-      echo "extension=raphf.so" > ${{targets.destdir}}/etc/php/conf.d/raphf.ini
+  - uses: pecl/install
+    with:
+      extension: "raphf"
 
   # PHP initialization is order dependent. So we will explicitly
   # load this by prefixing the file with 10- so it runs before

diff --git a/php-8.1-pecl-sqlsrv.yaml b/php-8.1-pecl-sqlsrv.yaml
@@ -35,14 +35,9 @@ pipeline:
 
   - uses: autoconf/make
 
-  # TODO: This is a temporary workaround until the pecl/install pipelines
-  # propagates through.
-  # https://github.com/chainguard-dev/melange/pull/1068
-  - name: Install
-    runs: |
-      make INSTALL_ROOT="${{targets.destdir}}" install
-      install -d ${{targets.destdir}}/etc/php/conf.d
-      echo "extension=sqlsrv.so" > ${{targets.destdir}}/etc/php/conf.d/sqlsrv.ini
+  - uses: pecl/install
+    with:
+      extension: "sqlsrv"
 
   - uses: strip
 

diff --git a/php-8.2-pecl-http.yaml b/php-8.2-pecl-http.yaml
@@ -39,14 +39,9 @@ pipeline:
 
   - uses: autoconf/make
 
-  # TODO: This is a temporary workaround until the pecl/install pipelines
-  # propagates through.
-  # https://github.com/chainguard-dev/melange/pull/1068
-  - name: Install
-    runs: |
-      make INSTALL_ROOT="${{targets.destdir}}" install
-      install -d ${{targets.destdir}}/etc/php/conf.d
-      echo "extension=http.so" > ${{targets.destdir}}/etc/php/conf.d/http.ini
+  - uses: pecl/install
+    with:
+      extension: "http"
 
   - uses: strip
 

diff --git a/php-8.2-pecl-pdosqlsrv.yaml b/php-8.2-pecl-pdosqlsrv.yaml
@@ -35,14 +35,9 @@ pipeline:
 
   - uses: autoconf/make
 
-  # TODO: This is a temporary workaround until the pecl/install pipelines
-  # propagates through.
-  # https://github.com/chainguard-dev/melange/pull/1068
-  - name: Install
-    runs: |
-      make INSTALL_ROOT="${{targets.destdir}}" install
-      install -d ${{targets.destdir}}/etc/php/conf.d
-      echo "extension=pdo_sqlsrv.so" > ${{targets.destdir}}/etc/php/conf.d/pdo_sqlsrv.ini
+  - uses: pecl/install
+    with:
+      extension: "pdo_sqlsrv"
 
   - uses: strip
 

diff --git a/php-8.2-pecl-raphf.yaml b/php-8.2-pecl-raphf.yaml
@@ -34,14 +34,9 @@ pipeline:
 
   - uses: autoconf/make
 
-  # TODO: This is a temporary workaround until the pecl/install pipelines
-  # propagates through.
-  # https://github.com/chainguard-dev/melange/pull/1068
-  - name: Install
-    runs: |
-      make INSTALL_ROOT="${{targets.destdir}}" install
-      install -d ${{targets.destdir}}/etc/php/conf.d
-      echo "extension=raphf.so" > ${{targets.destdir}}/etc/php/conf.d/raphf.ini
+  - uses: pecl/install
+    with:
+      extension: "raphf"
 
   # PHP initialization is order dependent. So we will explicitly
   # load this by prefixing the file with 10- so it runs before

diff --git a/php-8.2-pecl-sqlsrv.yaml b/php-8.2-pecl-sqlsrv.yaml
@@ -35,14 +35,9 @@ pipeline:
 
   - uses: autoconf/make
 
-  # TODO: This is a temporary workaround until the pecl/install pipelines
-  # propagates through.
-  # https://github.com/chainguard-dev/melange/pull/1068
-  - name: Install
-    runs: |
-      make INSTALL_ROOT="${{targets.destdir}}" install
-      install -d ${{targets.destdir}}/etc/php/conf.d
-      echo "extension=sqlsrv.so" > ${{targets.destdir}}/etc/php/conf.d/sqlsrv.ini
+  - uses: pecl/install
+    with:
+      extension: "sqlsrv"
 
   - uses: strip
 

diff --git a/php-8.3-pecl-http.yaml b/php-8.3-pecl-http.yaml
@@ -39,14 +39,9 @@ pipeline:
 
   - uses: autoconf/make
 
-  # TODO: This is a temporary workaround until the pecl/install pipelines
-  # propagates through.
-  # https://github.com/chainguard-dev/melange/pull/1068
-  - name: Install
-    runs: |
-      make INSTALL_ROOT="${{targets.destdir}}" install
-      install -d ${{targets.destdir}}/etc/php/conf.d
-      echo "extension=http.so" > ${{targets.destdir}}/etc/php/conf.d/http.ini
+  - uses: pecl/install
+    with:
+      extension: "http"
 
   - uses: strip
 

diff --git a/php-8.3-pecl-pdosqlsrv.yaml b/php-8.3-pecl-pdosqlsrv.yaml
@@ -35,14 +35,9 @@ pipeline:
 
   - uses: autoconf/make
 
-  # TODO: This is a temporary workaround until the pecl/install pipelines
-  # propagates through.
-  # https://github.com/chainguard-dev/melange/pull/1068
-  - name: Install
-    runs: |
-      make INSTALL_ROOT="${{targets.destdir}}" install
-      install -d ${{targets.destdir}}/etc/php/conf.d
-      echo "extension=pdo_sqlsrv.so" > ${{targets.destdir}}/etc/php/conf.d/pdo_sqlsrv.ini
+  - uses: pecl/install
+    with:
+      extension: "pdo_sqlsrv"
 
   - uses: strip
 

diff --git a/php-8.3-pecl-raphf.yaml b/php-8.3-pecl-raphf.yaml
@@ -34,14 +34,9 @@ pipeline:
 
   - uses: autoconf/make
 
-  # TODO: This is a temporary workaround until the pecl/install pipelines
-  # propagates through.
-  # https://github.com/chainguard-dev/melange/pull/1068
-  - name: Install
-    runs: |
-      make INSTALL_ROOT="${{targets.destdir}}" install
-      install -d ${{targets.destdir}}/etc/php/conf.d
-      echo "extension=raphf.so" > ${{targets.destdir}}/etc/php/conf.d/raphf.ini
+  - uses: pecl/install
+    with:
+      extension: "raphf"
 
   # PHP initialization is order dependent. So we will explicitly
   # load this by prefixing the file with 10- so it runs before

diff --git a/php-8.3-pecl-sqlsrv.yaml b/php-8.3-pecl-sqlsrv.yaml
@@ -35,14 +35,9 @@ pipeline:
 
   - uses: autoconf/make
 
-  # TODO: This is a temporary workaround until the pecl/install pipelines
-  # propagates through.
-  # https://github.com/chainguard-dev/melange/pull/1068
-  - name: Install
-    runs: |
-      make INSTALL_ROOT="${{targets.destdir}}" install
-      install -d ${{targets.destdir}}/etc/php/conf.d
-      echo "extension=sqlsrv.so" > ${{targets.destdir}}/etc/php/conf.d/sqlsrv.ini
+  - uses: pecl/install
+    with:
+      extension: "sqlsrv"
 
   - uses: strip