Merge pull request #29584 from taosdata/enh/add-more-ci

ci:add muti-system to test for tdengine

.github/workflows/taosd-ci-build.yml

@@ -10,15 +10,25 @@ on:
       - 'docs/**'
       - 'packaging/**'
       - 'tests/**'
-
+      - '*.md'
+      
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    name: Build and test
+    name: Build and test on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-20.04
+          - ubuntu-22.04
+          - ubuntu-24.04
+          - macos-13
+          - macos-14
+          - macos-15
 
     steps:
       - name: Checkout the repository
@@ -29,12 +39,19 @@ jobs:
         with:
           go-version: 1.18
 
-      - name: Install system dependencies
+      - name: Install dependencies on Linux
+        if: runner.os == 'Linux'
         run: |
           sudo apt update -y
           sudo apt install -y build-essential cmake \
             libgeos-dev libjansson-dev libsnappy-dev liblzma-dev libz-dev \
-            zlib1g pkg-config libssl-dev gawk
+            zlib1g-dev pkg-config libssl-dev gawk
+
+      - name: Install dependencies on macOS
+        if: runner.os == 'macOS'
+        run: |
+          brew update
+          brew install argp-standalone gflags pkg-config  snappy zlib geos jansson gawk openssl
 
       - name: Build and install TDengine
         run: |

cmake/curl_CMakeLists.txt.in

@@ -12,7 +12,7 @@ ExternalProject_Add(curl2
         BUILD_IN_SOURCE TRUE
         BUILD_ALWAYS 1
         UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.2 --with-ssl=$ENV{HOME}/.cos-local.2  --enable-shared=no --disable-ldap --disable-ldaps --without-brotli --without-zstd --without-libidn2 --without-nghttp2 --without-libpsl #--enable-debug
+        CONFIGURE_COMMAND ${CONTRIB_CONFIG_ENV} ./configure --prefix=$ENV{HOME}/.cos-local.2 --with-ssl=$ENV{HOME}/.cos-local.2  --enable-websockets --enable-shared=no --disable-ldap --disable-ldaps --without-brotli --without-zstd --without-libidn2 --without-nghttp2 --without-libpsl #--enable-debug
         BUILD_COMMAND make -j
         INSTALL_COMMAND make install
         TEST_COMMAND ""

cmake/ssl_CMakeLists.txt.in

@@ -6,9 +6,9 @@ ExternalProject_Add(openssl
         DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download"
         SOURCE_DIR "${TD_CONTRIB_DIR}/openssl"
         BUILD_IN_SOURCE TRUE
-        #BUILD_ALWAYS 1
-        #UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ./Configure --prefix=$ENV{HOME}/.cos-local.2 no-shared
+        BUILD_ALWAYS 1
+        UPDATE_COMMAND ""
+        CONFIGURE_COMMAND ${CONTRIB_CONFIG_ENV} ./Configure --prefix=$ENV{HOME}/.cos-local.2 no-shared
         BUILD_COMMAND make -j
         INSTALL_COMMAND make install_sw -j
         TEST_COMMAND ""

contrib/CMakeLists.txt

@@ -180,10 +180,12 @@ if(${BUILD_GEOS})
     cat("${TD_SUPPORT_DIR}/geos_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 endif()
 
-if (${BUILD_WITH_ANALYSIS})
+# libcurl
+if(NOT ${TD_WINDOWS})
+    file(MAKE_DIRECTORY $ENV{HOME}/.cos-local.2/)
     cat("${TD_SUPPORT_DIR}/ssl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
     cat("${TD_SUPPORT_DIR}/curl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-endif()
+endif(NOT ${TD_WINDOWS})
 
 #
 if(${BUILD_PCRE2})
@@ -201,6 +203,11 @@ endif()
 # lemon
 cat("${TD_SUPPORT_DIR}/lemon_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 
+# Force specify CC=cc on MacOS. Because the default CC setting in the generated Makefile has issues finding standard library headers
+IF(${TD_DARWIN})
+    SET(CONTRIB_CONFIG_ENV "CC=cc")
+ENDIF()
+
 # download dependencies
 configure_file(${CONTRIB_TMP_FILE} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
 execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .