Skip to content

Commit 5735e67

Browse files
committed
drop EL-8 + add more PHP versions (from distro)
1 parent 4f33c09 commit 5735e67

File tree

1 file changed

+11
-20
lines changed

1 file changed

+11
-20
lines changed

.github/workflows/ci.yaml

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
strategy:
1111
matrix:
1212
distro: ['rockylinux']
13-
el: [8, 9]
14-
php: ['8.0', '8.1', '8.2', '8.3']
13+
el: [9]
14+
php: ['8.0', '8.1', '8.2', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']
1515
container:
1616
image: ${{ matrix.distro }}:${{ matrix.el }}
1717
steps:
@@ -20,22 +20,10 @@ jobs:
2020
- name: Install PHP
2121
run: |
2222
dnf install -y "https://rpms.remirepo.net/enterprise/remi-release-${{ matrix.el }}.rpm"
23-
dnf config-manager --disable -y "epel" "remi-modular" "remi-safe"
24-
dnf --enablerepo=remi-modular module enable -y "php:remi-${{ matrix.php }}"
25-
dnf --enablerepo=epel,remi,remi-modular install -y "php" "php-devel"
23+
dnf module enable -y "php:${{ matrix.php }}"
24+
dnf install -y "php" "php-devel" "libxcrypt-devel"
2625
- name: Show PHP version
2726
run: php -v
28-
- name: Manually install libxcrypt 4.4.x (EL8 and earlier)
29-
if: ${{ matrix.el < 9 }}
30-
run: |
31-
dnf install -y "python3-pip" "perl-open" "git"
32-
pip3 install "passlib"
33-
git clone --depth=1 --branch="v4.4.36" "https://github.com/besser82/libxcrypt.git" "libxcrypt"
34-
cd "libxcrypt"
35-
./autogen.sh
36-
./configure --with-pkgconfigdir="/usr/lib64/pkgconfig" --libdir="/usr/lib64"
37-
make -j"$(nproc)"
38-
make install
3927
- name: Make php-xpass
4028
run: |
4129
phpize
@@ -51,17 +39,20 @@ jobs:
5139
strategy:
5240
matrix:
5341
fedora: [39, 40, 41]
54-
php: ['8.0', '8.1', '8.2', '8.3']
42+
php: [0, '8.0', '8.1', '8.2', '8.3']
5543
container:
5644
image: fedora:${{ matrix.fedora }}
5745
steps:
5846
- name: Checkout
5947
uses: actions/checkout@v4
60-
- name: Install PHP
48+
- name: Setup PHP module
49+
if: ${{ matrix.php }}
6150
run: |
6251
dnf install -y "https://rpms.remirepo.net/fedora/remi-release-${{ matrix.fedora }}.rpm"
63-
dnf --enablerepo=remi-modular module enable -y "php:remi-${{ matrix.php }}"
64-
dnf --enablerepo=remi,remi-modular install -y "php" "php-devel"
52+
dnf module enable -y "php:remi-${{ matrix.php }}"
53+
- name: Install PHP
54+
run: |
55+
dnf install -y "php" "php-devel" "libxcrypt-devel"
6556
- name: Show PHP version
6657
run: php -v
6758
- name: Make php-xpass

0 commit comments

Comments
 (0)