remove hiredis

swoole · Apr 11, 2024 · ab2eea8 · ab2eea8
1 parent caa4aeb
commit ab2eea8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 28 deletions.
diff --git a/.github/workflows/framework.yml b/.github/workflows/framework.yml
@@ -102,7 +102,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '8.0', '8.1', '8.2', '8.3' ]
+        php-version: [ '8.1', '8.2', '8.3' ]
         framework: [ 'Simps' ]
     name: ${{ matrix.framework }} - PHP ${{ matrix.php-version }} - macOS
     steps:

diff --git a/config.m4 b/config.m4
@@ -110,7 +110,7 @@ PHP_ARG_ENABLE([thread-context],
   [whether to enable thread context],
   [AS_HELP_STRING([--enable-thread-context],
     [Use thread context])], [no], [no])
-    
+
 PHP_ARG_ENABLE([swoole-thread],
   [whether to enable swoole thread support],
   [AS_HELP_STRING([--enable-swoole-thread],
@@ -1034,13 +1034,6 @@ EOF
         thirdparty/swoole_http_parser.c \
         thirdparty/multipart_parser.c"
 
-    swoole_source_file="$swoole_source_file \
-        thirdparty/hiredis/hiredis.c \
-        thirdparty/hiredis/alloc.c \
-        thirdparty/hiredis/net.c \
-        thirdparty/hiredis/read.c \
-        thirdparty/hiredis/sds.c"
-
     if test "$PHP_NGHTTP2_DIR" = "no"; then
         PHP_ADD_INCLUDE([$ext_srcdir/thirdparty])
 	    swoole_source_file="$swoole_source_file \
@@ -1191,7 +1184,6 @@ EOF
     PHP_ADD_INCLUDE([$ext_srcdir/include])
     PHP_ADD_INCLUDE([$ext_srcdir/ext-src])
     PHP_ADD_INCLUDE([$ext_srcdir/thirdparty])
-    PHP_ADD_INCLUDE([$ext_srcdir/thirdparty/hiredis])
 
     AC_MSG_CHECKING([swoole coverage])
     if test "$PHP_SWOOLE_COVERAGE" != "no"; then
@@ -1206,8 +1198,7 @@ EOF
         include/*.h \
         stubs/*.h \
         thirdparty/*.h \
-        thirdparty/nghttp2/*.h \
-        thirdparty/hiredis/*.h])
+        thirdparty/nghttp2/*.h])
 
     PHP_REQUIRE_CXX()
 
@@ -1236,7 +1227,6 @@ EOF
     PHP_ADD_BUILD_DIR($ext_builddir/src/wrapper)
     PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/boost)
     PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/boost/asm)
-    PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/hiredis)
     PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php/sockets)
     PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php/standard)
     PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php/curl)

diff --git a/package.xml b/package.xml
@@ -2407,21 +2407,6 @@
             <file role="src" name="thirdparty/boost/asm/make_sparc64_sysv_elf_gas.S" />
             <file role="src" name="thirdparty/boost/asm/make_x86_64_sysv_elf_gas.S" />
             <file role="src" name="thirdparty/boost/asm/make_x86_64_sysv_macho_gas.S" />
-            <file role="doc" name="thirdparty/hiredis/CHANGELOG.md" />
-            <file role="doc" name="thirdparty/hiredis/COPYING" />
-            <file role="doc" name="thirdparty/hiredis/README.md" />
-            <file role="src" name="thirdparty/hiredis/alloc.c" />
-            <file role="src" name="thirdparty/hiredis/alloc.h" />
-            <file role="src" name="thirdparty/hiredis/fmacros.h" />
-            <file role="src" name="thirdparty/hiredis/hiredis.c" />
-            <file role="src" name="thirdparty/hiredis/hiredis.h" />
-            <file role="src" name="thirdparty/hiredis/net.c" />
-            <file role="src" name="thirdparty/hiredis/net.h" />
-            <file role="src" name="thirdparty/hiredis/read.c" />
-            <file role="src" name="thirdparty/hiredis/read.h" />
-            <file role="src" name="thirdparty/hiredis/sds.c" />
-            <file role="src" name="thirdparty/hiredis/sds.h" />
-            <file role="src" name="thirdparty/hiredis/sdsalloc.h" />
             <file role="src" name="thirdparty/multipart_parser.c" />
             <file role="src" name="thirdparty/multipart_parser.h" />
             <file role="doc" name="thirdparty/nghttp2/COPYING" />