From f608c08af72d465e80020465ba89d091d2172a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Fri, 24 Mar 2023 17:32:32 +0100
Subject: [PATCH] Fix #85 Also package php-pecl-igbinary and php-pecl-msgpack
 from remi

---
 .gitlab-ci-files/deploy.yml  |  8 +++++---
 .gitlab-ci-files/package.yml | 28 ++++++++++++++++++++++------
 .gitlab-ci-files/test.yml    |  4 ++--
 .gitlab-ci.yml               |  2 ++
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci-files/deploy.yml b/.gitlab-ci-files/deploy.yml
index bc1f4e8..0d97754 100644
--- a/.gitlab-ci-files/deploy.yml
+++ b/.gitlab-ci-files/deploy.yml
@@ -14,13 +14,15 @@ debian11-deploy:
     - debian11-package
     - debian11-test
 
-phpredis-remi-deploy:
+remi-deploy:
   extends: .deploy
   script:
     - ./deploy_packages.sh rockylinux
   needs:
-    - phpredis-remi-package
-    - phpredis-remi-test
+    - remi-phpredis-package
+    - remi-igbinary-package
+    - remi-msgpack-package
+    - remi-phpredis-test
 
 .deploy:
   stage: deploy
diff --git a/.gitlab-ci-files/package.yml b/.gitlab-ci-files/package.yml
index 2ba68e2..91ba77b 100644
--- a/.gitlab-ci-files/package.yml
+++ b/.gitlab-ci-files/package.yml
@@ -10,16 +10,32 @@ debian11-package:
   script:
     - make deb
 
-phpredis-remi-package:
+remi-phpredis-package:
+  extends: .remi-package
+  variables:
+    PACKAGE: $PHP_REDIS_REMI_VERSION
+
+remi-igbinary-package:
+  extends: .remi-package
+  variables:
+    PACKAGE: $PHP_IGBINARY_REMI_VERSION
+
+remi-msgpack-package:
+  extends: .remi-package
+  variables:
+    PACKAGE: $PHP_MSGPACK_REMI_VERSION
+
+.remi-package:
   extends: .package
   image: gitlab.linphone.org:4567/bc/public/docker/rocky8-php:$ROCKY_8_IMAGE_VERSION
   script:
     - mkdir -p $CI_PROJECT_DIR/build
-    - yum -y install wget php-devel gcc liblzf php-pear  php-pecl-igbinary-devel php-pecl-msgpack-devel lz4-devel liblzf-devel libzstd-devel
-    - wget https://rpms.remirepo.net/SRPMS/$PHP_REDIS_REMI_VERSION.remi.src.rpm
-    - rpmbuild --rebuild $PHP_REDIS_REMI_VERSION.remi.src.rpm
-    - rm /root/rpmbuild/RPMS/*/*debug*.rpm # Remove the debug packages
-    - mv /root/rpmbuild/RPMS/*/*.rpm $CI_PROJECT_DIR/build/$PHP_REDIS_REMI_VERSION.el8.x86_64.rpm # Rename to fit our naming format
+    - yum -y install wget php-devel gcc liblzf php-pear php-pecl-igbinary-devel php-pecl-msgpack-devel lz4-devel liblzf-devel libzstd-devel php-pecl-apcu-devel
+    - wget https://rpms.remirepo.net/SRPMS/$PACKAGE.remi.src.rpm
+    - rpmbuild --rebuild $PACKAGE.remi.src.rpm
+    - rm -f /root/rpmbuild/RPMS/*/*debug*.rpm
+    - rm -f /root/rpmbuild/RPMS/*/*devel*.rpm
+    - mv /root/rpmbuild/RPMS/*/*.rpm $CI_PROJECT_DIR/build/$PACKAGE.el8.x86_64.rpm # Rename to fit our naming format
     - rm -r /root/rpmbuild # Cleanup
 
 .package:
diff --git a/.gitlab-ci-files/test.yml b/.gitlab-ci-files/test.yml
index dd5d75c..28add12 100644
--- a/.gitlab-ci-files/test.yml
+++ b/.gitlab-ci-files/test.yml
@@ -28,11 +28,11 @@ debian11-test:
     - php artisan key:generate
     - vendor/bin/phpunit --log-junit $CI_PROJECT_DIR/flexiapi_phpunit.log
 
-phpredis-remi-test:
+remi-phpredis-test:
   extends: .test
   image: gitlab.linphone.org:4567/bc/public/docker/rocky8-php:$ROCKY_8_IMAGE_VERSION
   needs:
-    - phpredis-remi-package
+    - remi-phpredis-package
   script:
     - yum -y localinstall build/*.rpm
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8465a38..bf7c2c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,8 @@ variables:
   ROCKY_8_IMAGE_VERSION: 20230323_113930_add_git
   DEBIAN_11_IMAGE_VERSION: 20230322_172926_missing_tools
   PHP_REDIS_REMI_VERSION: php-pecl-redis5-5.3.6-1
+  PHP_IGBINARY_REMI_VERSION: php-pecl-igbinary-3.2.14-1
+  PHP_MSGPACK_REMI_VERSION: php-pecl-msgpack-2.1.2-1
 
 include:
   - '.gitlab-ci-files/package.yml'