From 5735e67e51752214b8933eb43b99cfcf9df5b415 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 4 Sep 2024 08:11:32 +0200
Subject: drop EL-8 + add more PHP versions (from distro)

---
 .github/workflows/ci.yaml | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

(limited to '.github/workflows/ci.yaml')

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7796d9e..bdef1ba 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,8 +10,8 @@ jobs:
     strategy:
       matrix:
         distro: ['rockylinux']
-        el: [8, 9]
-        php: ['8.0', '8.1', '8.2', '8.3']
+        el: [9]
+        php: ['8.0', '8.1', '8.2', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']
     container:
       image: ${{ matrix.distro }}:${{ matrix.el }}
     steps:
@@ -20,22 +20,10 @@ jobs:
       - name: Install PHP
         run: |
           dnf install -y "https://rpms.remirepo.net/enterprise/remi-release-${{ matrix.el }}.rpm"
-          dnf config-manager --disable -y "epel" "remi-modular" "remi-safe"
-          dnf --enablerepo=remi-modular module enable -y "php:remi-${{ matrix.php }}"
-          dnf --enablerepo=epel,remi,remi-modular install -y "php" "php-devel"
+          dnf module enable -y "php:${{ matrix.php }}"
+          dnf install -y "php" "php-devel" "libxcrypt-devel"
       - name: Show PHP version
         run: php -v
-      - name: Manually install libxcrypt 4.4.x (EL8 and earlier)
-        if: ${{ matrix.el < 9 }}
-        run: |
-          dnf install -y "python3-pip" "perl-open" "git"
-          pip3 install "passlib"
-          git clone --depth=1 --branch="v4.4.36" "https://github.com/besser82/libxcrypt.git" "libxcrypt"
-          cd "libxcrypt"
-          ./autogen.sh
-          ./configure --with-pkgconfigdir="/usr/lib64/pkgconfig" --libdir="/usr/lib64"
-          make -j"$(nproc)"
-          make install
       - name: Make php-xpass
         run: |
           phpize
@@ -51,17 +39,20 @@ jobs:
     strategy:
       matrix:
         fedora: [39, 40, 41]
-        php: ['8.0', '8.1', '8.2', '8.3']
+        php: [0, '8.0', '8.1', '8.2', '8.3']
     container:
       image: fedora:${{ matrix.fedora }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Install PHP
+      - name: Setup PHP module
+        if: ${{ matrix.php }}
         run: |
           dnf install -y "https://rpms.remirepo.net/fedora/remi-release-${{ matrix.fedora }}.rpm"
-          dnf --enablerepo=remi-modular module enable -y "php:remi-${{ matrix.php }}"
-          dnf --enablerepo=remi,remi-modular install -y "php" "php-devel"
+          dnf module enable -y "php:remi-${{ matrix.php }}"
+      - name: Install PHP
+        run: |
+          dnf install -y "php" "php-devel" "libxcrypt-devel"
       - name: Show PHP version
         run: php -v
       - name: Make php-xpass
-- 
cgit