update ext versions

DataDog · Nov 28, 2024 · 133de1a · 133de1a
1 parent b772226
commit 133de1a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 26 deletions.
diff --git a/dockerfiles/ci/bookworm/build-extensions.sh b/dockerfiles/ci/bookworm/build-extensions.sh
@@ -124,16 +124,7 @@ else
   pecl install sqlsrv$SQLSRV_VERSION; echo "extension=sqlsrv.so" >> ${iniDir}/sqlsrv.ini;
   # Xdebug is disabled by default
   for VERSION in "${XDEBUG_VERSIONS[@]}"; do
-    if [[ "${VERSION}" == "-3.4.0" ]]; then
-      curl -LO https://github.com/xdebug/xdebug/archive/12adc6394adbf14f239429d72cf34faadddd19fb.tar.gz
-      tar -xvzf 12adc6394adbf14f239429d72cf34faadddd19fb.tar.gz;
-      cd xdebug-12adc6394adbf14f239429d72cf34faadddd19fb;
-      phpize;
-      ./configure;
-      make && make install;
-    else
-      pecl install xdebug$VERSION;
-    fi
+    pecl install xdebug$VERSION;
     cd $(php-config --extension-dir);
     mv xdebug.so xdebug$VERSION.so;
   done
@@ -144,4 +135,17 @@ else
     pecl install parallel;
     echo "extension=parallel" >> ${iniDir}/parallel.ini;
   fi
+
+  # ext-swoole needs PHP 8
+  if [[ $PHP_VERSION_ID -ge 80 ]]; then
+    pushd /tmp
+    pecl download swoole-6.0.0RC1; # we don't install swoole here
+    tar xzf swoole-6.0.0RC1.tgz
+    cd swoole-6.0.0RC1
+    phpize
+    ./configure --host=$HOST_ARCH-linux-gnu
+    make -j "$((`nproc`+1))"
+    make install
+    popd
+  fi
 fi
diff --git a/dockerfiles/ci/buster/build-extensions.sh b/dockerfiles/ci/buster/build-extensions.sh
@@ -131,17 +131,7 @@ else
   pecl install sqlsrv$SQLSRV_VERSION;
   # Xdebug is disabled by default
   for VERSION in "${XDEBUG_VERSIONS[@]}"; do
-    if [[ "${VERSION}" == "-3.4.0" ]]; then
-      curl -LO https://github.com/xdebug/xdebug/archive/12adc6394adbf14f239429d72cf34faadddd19fb.tar.gz
-      tar -xvzf 12adc6394adbf14f239429d72cf34faadddd19fb.tar.gz;
-      cd xdebug-12adc6394adbf14f239429d72cf34faadddd19fb;
-      phpize;
-      ./configure;
-      make -j "$((`nproc`+1))";
-      make install;
-    else
-      pecl install xdebug$VERSION;
-    fi
+    pecl install xdebug$VERSION;
     cd $(php-config --extension-dir);
     mv xdebug.so xdebug$VERSION.so;
   done
@@ -154,12 +144,11 @@ else
   fi
 
   # ext-swoole needs PHP 8
-  # currently no swoole for PHP 8.4, see https://github.com/swoole/swoole-src/issues/5451
-  if [[ $PHP_VERSION_ID -ge 80 && $PHP_VERSION_ID -lt 84 ]]; then
+  if [[ $PHP_VERSION_ID -ge 80 ]]; then
     pushd /tmp
-    pecl download swoole-5.1.2; # we don't install swoole here
-    tar xzf swoole-5.1.2.tgz
-    cd swoole-5.1.2
+    pecl download swoole-6.0.0RC1; # we don't install swoole here
+    tar xzf swoole-6.0.0RC1.tgz
+    cd swoole-6.0.0RC1
     phpize
     ./configure --host=$HOST_ARCH-linux-gnu
     make -j "$((`nproc`+1))"