diff --git a/.gitlab-ci-files/deploy.yml b/.gitlab-ci-files/deploy.yml index 80bd97f..4fa123d 100644 --- a/.gitlab-ci-files/deploy.yml +++ b/.gitlab-ci-files/deploy.yml @@ -14,6 +14,14 @@ rocky9-deploy: - rocky9-package - rocky9-test +rocky10-deploy: + extends: .deploy + script: + - ./deploy_packages.sh rockylinux 10 + needs: + - rocky10-package + - rocky10-test + debian12-deploy: extends: .deploy script: diff --git a/.gitlab-ci-files/package.yml b/.gitlab-ci-files/package.yml index ba2e620..68fd0cc 100644 --- a/.gitlab-ci-files/package.yml +++ b/.gitlab-ci-files/package.yml @@ -14,6 +14,14 @@ rocky9-package: script: - make package-el9 +rocky10-package: + needs: + - prepare-package + extends: .package + image: gitlab.linphone.org:4567/bc/public/docker/rocky10-php:$ROCKY_10_IMAGE_VERSION + script: + - make package-el10 + debian12-package: needs: - prepare-package diff --git a/.gitlab-ci-files/test.yml b/.gitlab-ci-files/test.yml index 94de4b1..19edaf5 100644 --- a/.gitlab-ci-files/test.yml +++ b/.gitlab-ci-files/test.yml @@ -10,6 +10,12 @@ rocky9-test: needs: - rocky9-package +rocky10-test: + extends: .rocky-test + image: gitlab.linphone.org:4567/bc/public/docker/rocky10-php:$ROCKY_10_IMAGE_VERSION + needs: + - rocky10-package + .rocky-test: extends: .test script: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b774d0..3a611e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ variables: ROCKY_8_IMAGE_VERSION: 20250702_171834_update_rocky8_dockerhub ROCKY_9_IMAGE_VERSION: 20250702_171314_update_rocky9_dockerhub + ROCKY_10_IMAGE_VERSION: 20250908_164454_rocky10_first DEBIAN_12_IMAGE_VERSION: 20250908_154742_refresh_dependencies DEBIAN_13_IMAGE_VERSION: 20250908_114350_debian13_first_push PHP_REDIS_REMI_VERSION: php-pecl-redis6-6.1.0-1 diff --git a/CHANGELOG.md b/CHANGELOG.md index a147cf2..914a66b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ v2.1 - Fix FLEXIAPI-377 Don't reset authInfoIndex in the Provisioning - Fix FLEXIAPI-380 Fix CardDav documentation - Fix FLEXIAPI-381 Remove Remi in the Rocky9 pipeline +- Fix FLEXIAPI-382 Package for Rocky 10 v2.0 ---- diff --git a/INSTALL.md b/INSTALL.md index 8a91650..9a6b8bb 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -24,7 +24,7 @@ FlexiAPI is packaged for Debian and RedHat, you can setup those repositories usi The `artisan` script is in the root directory of where the application is setup, with packages its often `/opt/belledonne-communications/share/flexisip-account-manager/flexiapi/`. -โš ๏ธ If you want to enable JWT authentication the php-sodium dependency is required, on Rockylinux it is only available in the Remi repository in some cases. You can install it with the following step: +โš ๏ธ If you want to enable JWT authentication the php-sodium dependency is required, on Rockylinux it is only available in the Remi repository in some cases. You can install it with the following steps: dnf -y install https://rpms.remirepo.net/enterprise/remi-release-{rockylinux-release}.rpm dnf -y module reset php diff --git a/Makefile b/Makefile index 9397b10..716991c 100644 --- a/Makefile +++ b/Makefile @@ -68,6 +68,11 @@ rpm-el9-only: rpmbuild --quiet -bb --define 'dist .el9' --define '_topdir $(OUTPUT_DIR)/rpmbuild' --define "_rpmdir $(OUTPUT_DIR)/rpmbuild" $(OUTPUT_DIR)/rpmbuild/SPECS/flexisip-account-manager.spec @echo "๐Ÿ“ฆโœ… RPM el9 Package Created" +rpm-el10-only: + mkdir -p build + rpmbuild --quiet -bb --define 'dist .el10' --define '_topdir $(OUTPUT_DIR)/rpmbuild' --define "_rpmdir $(OUTPUT_DIR)/rpmbuild" $(OUTPUT_DIR)/rpmbuild/SPECS/flexisip-account-manager.spec + @echo "๐Ÿ“ฆโœ… RPM el10 Package Created" + rpm-cleanup: @echo "๐Ÿงน Cleanup" mv rpmbuild/*/*.rpm build/. @@ -101,6 +106,10 @@ package-el9: rpm-el9-only rpm-cleanup cleanup-package-semvers package-end-common rpm-el9: prepare-common package-el9 rpm-el9-dev: prepare-dev package-semvers package-common package-el9 +package-el10: rpm-el10-only rpm-cleanup cleanup-package-semvers package-end-common +rpm-el10: prepare-common package-el10 +rpm-el10-dev: prepare-dev package-semvers package-common package-el10 + package-deb: deb-only cleanup-package-semvers package-end-common deb: prepare-common package-deb deb-dev: prepare-dev package-semvers package-common package-deb