From 9de4f4a6f367bdfb767e05e07ba49ad50c096e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20KUBLER?= Date: Fri, 3 Jul 2026 11:08:17 +0200 Subject: [PATCH 1/3] chore(amqp): update to librabbitmq-c-0.17.0 --- conf/versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/versions.sh b/conf/versions.sh index 76af3430..7e93686a 100644 --- a/conf/versions.sh +++ b/conf/versions.sh @@ -30,7 +30,7 @@ PHP_MODULE_API_VERSIONS["8.5"]="20250925" libmemcached_version="1.0.18" # Mandatory for multibytes strings starting with PHP 7.4 libonig_version="${libonig_version:-6.9.10}" -librabbitmq_version="0.15.0" +librabbitmq_version="0.17.0" memcached_version="3.4.0" gmp_version="6.3.0" From c8ff07f45780781857955aa0f678033022bb55c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20KUBLER?= Date: Fri, 3 Jul 2026 11:10:03 +0200 Subject: [PATCH 2/3] chore(amqp): update packaging script Removed support for deprecated stacks.\nAlso updated coding style. --- support/ext/amqp | 170 ++++++++++++++++++++--------------------------- 1 file changed, 73 insertions(+), 97 deletions(-) diff --git a/support/ext/amqp b/support/ext/amqp index a341e372..bcc9d569 100755 --- a/support/ext/amqp +++ b/support/ext/amqp @@ -65,97 +65,80 @@ build_librabbitmq() { download_archive "${archive_url}" \ | tar xvz --strip-components=1 - if [ "${STACK}" = "scalingo-18" ]; then - cmake \ - -DCMAKE_INSTALL_PREFIX="${librabbitmq_dir}" \ - -DBUILD_TESTS=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_TOOLS=OFF \ - -DBUILD_TOOLS_DOCS=OFF \ - -DBUILD_API_DOCS=OFF \ - -DRUN_SYSTEM_TESTS=OFF \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_STATIC_LIBS=OFF \ - -Wno-dev \ - || ( echo "Failed to build librabbitmq." \ - && exit 1 ) - else - cmake \ - -DCMAKE_INSTALL_PREFIX="${librabbitmq_dir}" \ - -DBUILD_TESTING=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_TOOLS=OFF \ - -DBUILD_TOOLS_DOCS=OFF \ - -DBUILD_API_DOCS=OFF \ - -DRUN_SYSTEM_TESTS=OFF \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_STATIC_LIBS=OFF \ - -Wno-dev \ - || ( echo "Failed to build librabbitmq." \ - && exit 1 ) - fi - - cmake \ - --build . \ - --config Release \ - --target install \ - || ( echo "Failed to build librabbitmq." \ - && exit 1 ) - - popd - - mkdir -p "${PREFIX}/lib" - - if [ "${STACK}" = "scalingo-18" ]; then - # Move things that have been stored in `${prefix}/lib/x86_64-linux-gnu` - # to `${prefix}/lib` so that AMQP's `configure` finds them. - find "${librabbitmq_dir}/lib/x86_64-linux-gnu" \ - -mindepth 1 \ - -maxdepth 1 \ - -exec mv --target-directory "${librabbitmq_dir}/lib/" -- {} \+ - - rmdir "${librabbitmq_dir}/lib/x86_64-linux-gnu" - fi - - # Copy library to `$PREFIX/lib` so it's included in the future package - cp -ar "${librabbitmq_dir}" "${PREFIX}/lib/" + if ! cmake \ + -DCMAKE_INSTALL_PREFIX="${librabbitmq_dir}" \ + -DBUILD_TESTING=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TOOLS=OFF \ + -DBUILD_TOOLS_DOCS=OFF \ + -DBUILD_API_DOCS=OFF \ + -DRUN_SYSTEM_TESTS=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_STATIC_LIBS=OFF \ + -Wno-dev + then + echo "Failed to build librabbitmq." + exit 1 + fi + + if ! cmake \ + --build . \ + --config Release \ + --target install + then + echo "Failed to build librabbitmq." + exit 1 + fi + + popd + + mkdir --parents "${PREFIX}/lib" + + # Copy library to `$PREFIX/lib` so it's included in the future package + cp --archive --recursive "${librabbitmq_dir}" "${PREFIX}/lib/" } build_amqp() { - local pkgname - local pkgver - local url - local librabbitmq_dir - - pkgname="${1}" - pkgver="${2}" - url="${3}" - librabbitmq_dir="${4}" - - printf -v archive_url "${url}" "${pkgver}" - - mkdir -p "${pkgname}-${pkgver}" - pushd "${pkgname}-${pkgver}" - - download_archive "${archive_url}" \ - | tar xvz --strip-components=1 - - /app/vendor/php/bin/phpize \ - || ( echo "Failed to PHPize AMQP extension." \ - && exit 1 ) - - ./configure \ - --with-php-config="/app/vendor/php/bin/php-config" \ - --with-librabbitmq-dir="${librabbitmq_dir}" \ - || ( echo "Failed to configure AMQP extension." \ - && exit 1 ) - - make \ - || ( echo "Failed to build AMQP extension." \ - && exit 1 ) - - popd + local pkgname + local pkgver + local url + local librabbitmq_dir + + pkgname="${1}" + pkgver="${2}" + url="${3}" + librabbitmq_dir="${4}" + + printf -v archive_url "${url}" "${pkgver}" + + mkdir --parents "${pkgname}-${pkgver}" + pushd "${pkgname}-${pkgver}" > /dev/null + + download_archive "${archive_url}" \ + | tar --extract --gzip --strip-components=1 + + if ! /app/vendor/php/bin/phpize + then + echo "Failed to PHPize AMQP extension." + exit 1 + fi + + if ! ./configure \ + --with-php-config="/app/vendor/php/bin/php-config" \ + --with-librabbitmq-dir="${librabbitmq_dir}" + then + echo "Failed to configure AMQP extension." + exit 1 + fi + + if ! make + then + echo "Failed to build AMQP extension." + exit 1 + fi + + popd > /dev/null } @@ -182,12 +165,6 @@ pkgname="librabbitmq-c" source_url="https://github.com/alanxz/rabbitmq-c/archive/refs/tags/v%s.tar.gz" case "${STACK}" in - "scalingo-18") - version="0.11.0" - ;; - "scalingo-20") - version="0.13.0" - ;; *) version="${librabbitmq_version}" ;; @@ -203,9 +180,6 @@ pkgname="amqp" source_url="https://pecl.php.net/get/amqp-%s.tgz" case "${STACK}" in - "scalingo-18") - version="1.11.0" - ;; *) version="${amqp_version}" ;; @@ -220,7 +194,9 @@ echo "extension=amqp.so" > "${PREFIX}/etc/conf.d/amqp.ini" # # | Stack | amqp | librabbitmq | # | ----------- | ------ | ----------- | -# | scalingo-22 | 2.1.2 | 0.14.0 | +# | scalingo-26 | 2.2.0 | 0.17.0 | +# | scalingo-24 | 2.2.0 | 0.17.0 | +# | scalingo-22 | 2.2.0 | 0.17.0 | # | scalingo-20 | 2.1.2 | 0.13.0 | # | scalingo-18 | 1.11.0 | 0.11.0 | # From 01b3b32d622414bdf822506cbbae2b3d3899ab24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20KUBLER?= Date: Fri, 3 Jul 2026 12:18:31 +0200 Subject: [PATCH 3/3] chore(amqp): remove mentions to deprecated stacks Following review --- support/ext/amqp | 2 -- 1 file changed, 2 deletions(-) diff --git a/support/ext/amqp b/support/ext/amqp index bcc9d569..bcfda578 100755 --- a/support/ext/amqp +++ b/support/ext/amqp @@ -197,8 +197,6 @@ echo "extension=amqp.so" > "${PREFIX}/etc/conf.d/amqp.ini" # | scalingo-26 | 2.2.0 | 0.17.0 | # | scalingo-24 | 2.2.0 | 0.17.0 | # | scalingo-22 | 2.2.0 | 0.17.0 | -# | scalingo-20 | 2.1.2 | 0.13.0 | -# | scalingo-18 | 1.11.0 | 0.11.0 | #