From 7712bf15e8375f241bce065b96039197e36fe607 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Thu, 16 Jan 2025 15:56:24 +0800 Subject: [PATCH 1/8] Update taosd-ci-build.yml --- .github/workflows/taosd-ci-build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml index e424d0b8ab..99cd6f7195 100644 --- a/.github/workflows/taosd-ci-build.yml +++ b/.github/workflows/taosd-ci-build.yml @@ -17,8 +17,11 @@ concurrency: jobs: build: - runs-on: ubuntu-latest - name: Build and test + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] + name: Build and test on ${{ matrix.os }} steps: - name: Checkout the repository From 494fc4cd4863515eca82e182ca6d23ca26a1e032 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Thu, 16 Jan 2025 20:34:33 +0800 Subject: [PATCH 2/8] ci: add more system for tdengine --- .github/workflows/taosd-ci-build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml index 99cd6f7195..753cd5b48f 100644 --- a/.github/workflows/taosd-ci-build.yml +++ b/.github/workflows/taosd-ci-build.yml @@ -10,6 +10,8 @@ on: - 'docs/**' - 'packaging/**' - 'tests/**' + - 'README.md' + - 'README-CN.md' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -20,7 +22,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04] + os: [ubuntu-latest, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-latest, macos-13, macos-14, macos-15] name: Build and test on ${{ matrix.os }} steps: From b81e4127640b1bbbb8732d16937b6c3331007bd3 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Thu, 16 Jan 2025 21:10:13 +0800 Subject: [PATCH 3/8] ci: add mac prerequisites --- .github/workflows/taosd-ci-build.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml index 753cd5b48f..f0c985eb77 100644 --- a/.github/workflows/taosd-ci-build.yml +++ b/.github/workflows/taosd-ci-build.yml @@ -10,8 +10,6 @@ on: - 'docs/**' - 'packaging/**' - 'tests/**' - - 'README.md' - - 'README-CN.md' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -19,11 +17,8 @@ concurrency: jobs: build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-latest, macos-13, macos-14, macos-15] - name: Build and test on ${{ matrix.os }} + runs-on: ubuntu-latest + name: Build and test steps: - name: Checkout the repository @@ -35,11 +30,18 @@ jobs: go-version: 1.18 - name: Install system dependencies + 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: | From f9329ec22f92765012025cf97ea5809968620268 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Thu, 16 Jan 2025 21:12:13 +0800 Subject: [PATCH 4/8] Update taosd-ci-build.yml --- .github/workflows/taosd-ci-build.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml index f0c985eb77..4883aaf754 100644 --- a/.github/workflows/taosd-ci-build.yml +++ b/.github/workflows/taosd-ci-build.yml @@ -10,15 +10,20 @@ on: - 'docs/**' - 'packaging/**' - 'tests/**' - + - 'README.md' + - 'README-CN.md' + concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: build: - runs-on: ubuntu-latest - name: Build and test + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-latest, macos-13, macos-14, macos-15] + name: Build and test on ${{ matrix.os }} steps: - name: Checkout the repository From 0f0fc76f5c9cc4dffb500bdf920cd77cbc64a538 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Thu, 16 Jan 2025 21:15:31 +0800 Subject: [PATCH 5/8] Update taosd-ci-build.yml --- .github/workflows/taosd-ci-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml index 4883aaf754..fad478cc39 100644 --- a/.github/workflows/taosd-ci-build.yml +++ b/.github/workflows/taosd-ci-build.yml @@ -34,8 +34,8 @@ jobs: with: go-version: 1.18 - - name: Install system dependencies - if: runner.os == 'Linux' + - name: Install dependencies on Linux + if: runner.os == 'Linux' run: | sudo apt update -y sudo apt install -y build-essential cmake \ From 42f79ea70b7e8dbf14211968f08c39120a6e09cb Mon Sep 17 00:00:00 2001 From: WANG Xu Date: Wed, 5 Feb 2025 13:55:45 +0800 Subject: [PATCH 6/8] Update .github/workflows/taosd-ci-build.yml --- .github/workflows/taosd-ci-build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml index fad478cc39..7c5aeb7bfc 100644 --- a/.github/workflows/taosd-ci-build.yml +++ b/.github/workflows/taosd-ci-build.yml @@ -10,8 +10,7 @@ on: - 'docs/**' - 'packaging/**' - 'tests/**' - - 'README.md' - - 'README-CN.md' + - '*.md' concurrency: group: ${{ github.workflow }}-${{ github.ref }} From 3a5f7b0fcdb5ae2a48e109ba565d2c101b170ec9 Mon Sep 17 00:00:00 2001 From: WANG Xu Date: Wed, 5 Feb 2025 17:10:44 +0800 Subject: [PATCH 7/8] refactor: remove ubuntu-latest and macos-latest Signed-off-by: WANG Xu --- .github/workflows/taosd-ci-build.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml index 7c5aeb7bfc..372008b585 100644 --- a/.github/workflows/taosd-ci-build.yml +++ b/.github/workflows/taosd-ci-build.yml @@ -18,11 +18,17 @@ concurrency: jobs: build: + name: Build and test on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-latest, macos-13, macos-14, macos-15] - name: Build and test on ${{ matrix.os }} + os: + - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-24.04 + - macos-13 + - macos-14 + - macos-15 steps: - name: Checkout the repository From f1d1f70c7278689f2e090124cdb9eecbe95de28d Mon Sep 17 00:00:00 2001 From: Jinqing Kuang Date: Wed, 5 Feb 2025 17:55:11 +0800 Subject: [PATCH 8/8] fix(compile): Fix community version build on macOS --- cmake/curl_CMakeLists.txt.in | 2 +- cmake/ssl_CMakeLists.txt.in | 6 +++--- contrib/CMakeLists.txt | 11 +++++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/cmake/curl_CMakeLists.txt.in b/cmake/curl_CMakeLists.txt.in index 6494177faf..2a14018810 100644 --- a/cmake/curl_CMakeLists.txt.in +++ b/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 "" diff --git a/cmake/ssl_CMakeLists.txt.in b/cmake/ssl_CMakeLists.txt.in index 1098593943..81e1cb15e9 100644 --- a/cmake/ssl_CMakeLists.txt.in +++ b/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 "" diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 9c719eb68d..59ba8ccfc5 100644 --- a/contrib/CMakeLists.txt +++ b/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}" .