From dc1ab696d4a320f1c26017b87c224fe8005db599 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Fri, 27 Dec 2024 19:40:34 +0800 Subject: [PATCH 1/5] Create taosd-ci-build.yml --- .github/workflows/taosd-ci-build.yml | 65 ++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 .github/workflows/taosd-ci-build.yml diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml new file mode 100644 index 0000000000..3ac3caaa7f --- /dev/null +++ b/.github/workflows/taosd-ci-build.yml @@ -0,0 +1,65 @@ +name: TDengine CI + +on: + pull_request: + branches: + - 'main' + - '3.0' + - '3.1' + push: + branches: + - 'enh/main/TD-33380' + - '3.0' + - '3.1' + - 'main' + +jobs: + build: + runs-on: ubuntu-latest + name: Run unit tests + + steps: + - name: Checkout the repository + uses: actions/checkout@v4 + + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version: 1.18 + + - name: Install system dependencies + run: | + sudo apt update -y + sudo apt install -y build-essential cmake libgeos-dev + + - name: Install TDengine + run: | + mkdir debug + cd debug + cmake .. -DBUILD_HTTP=false -DBUILD_JDBC=false -DBUILD_TOOLS=false -DBUILD_TEST=off -DBUILD_KEEPER=true -DBUILD_DEPENDENCY_TESTS=false + make -j 4 + sudo make install + which taosd + which taosadapter + which taoskeeper + + - name: Start taosd + run: | + cp /etc/taos/taos.cfg ./ + sudo echo "supportVnodes 256" >> taos.cfg + nohup sudo taosd -c taos.cfg & + + - name: Start taosadapter + run: nohup sudo taosadapter & + + - name: Run tests with coverage + working-directory: tools/keeper + run: | + taosBenchmark -t 10 -n 10 -y + taos -s "select count(*) from test.meters" + + - name: Clean up + if: always() + run: | + if pgrep taosd; then sudo pkill taosd; fi + if pgrep taosadapter; then sudo pkill taosadapter; fi From 0928590519fff3d01e6f1c2c99932680088813fa Mon Sep 17 00:00:00 2001 From: haoranchen Date: Fri, 27 Dec 2024 19:43:09 +0800 Subject: [PATCH 2/5] Update taosd-ci-build.yml --- .github/workflows/taosd-ci-build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml index 3ac3caaa7f..4495fd737e 100644 --- a/.github/workflows/taosd-ci-build.yml +++ b/.github/workflows/taosd-ci-build.yml @@ -36,7 +36,7 @@ jobs: run: | mkdir debug cd debug - cmake .. -DBUILD_HTTP=false -DBUILD_JDBC=false -DBUILD_TOOLS=false -DBUILD_TEST=off -DBUILD_KEEPER=true -DBUILD_DEPENDENCY_TESTS=false + cmake .. -DBUILD_HTTP=false -DBUILD_JDBC=false -DBUILD_TOOLS=true -DBUILD_TEST=off -DBUILD_KEEPER=true -DBUILD_DEPENDENCY_TESTS=false make -j 4 sudo make install which taosd @@ -52,8 +52,7 @@ jobs: - name: Start taosadapter run: nohup sudo taosadapter & - - name: Run tests with coverage - working-directory: tools/keeper + - name: Run tests with taosBenchmark run: | taosBenchmark -t 10 -n 10 -y taos -s "select count(*) from test.meters" From a675882d14c898b080796b418ab36d851128ea41 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Fri, 27 Dec 2024 19:53:37 +0800 Subject: [PATCH 3/5] fix: add dependencies for taos-tools compile --- .github/workflows/taosd-ci-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml index 4495fd737e..8a0294a0a6 100644 --- a/.github/workflows/taosd-ci-build.yml +++ b/.github/workflows/taosd-ci-build.yml @@ -30,7 +30,8 @@ jobs: - name: Install system dependencies run: | sudo apt update -y - sudo apt install -y build-essential cmake libgeos-dev + sudo apt install -y build-essential cmake libgeos-dev libjansson-dev libsnappy-dev liblzma-dev libz-dev zlib1g pkg-config libssl-dev gawk + - name: Install TDengine run: | From a005a132d9e75d3c98e0e491314279d79f60be4b Mon Sep 17 00:00:00 2001 From: haoranchen Date: Fri, 27 Dec 2024 20:15:52 +0800 Subject: [PATCH 4/5] Update taosd-ci-build.yml --- .github/workflows/taosd-ci-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml index 8a0294a0a6..3adfde3460 100644 --- a/.github/workflows/taosd-ci-build.yml +++ b/.github/workflows/taosd-ci-build.yml @@ -8,7 +8,6 @@ on: - '3.1' push: branches: - - 'enh/main/TD-33380' - '3.0' - '3.1' - 'main' From 28342a0e4472d2ee644b0a1714d8fb82cdab7603 Mon Sep 17 00:00:00 2001 From: WANG Xu Date: Sun, 29 Dec 2024 15:44:34 +0800 Subject: [PATCH 5/5] refactor: break long lines with backslash --- .github/workflows/taosd-ci-build.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml index 3adfde3460..d0915b9547 100644 --- a/.github/workflows/taosd-ci-build.yml +++ b/.github/workflows/taosd-ci-build.yml @@ -1,4 +1,4 @@ -name: TDengine CI +name: TDengine Build on: pull_request: @@ -29,14 +29,17 @@ jobs: - name: Install system dependencies 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 + sudo apt install -y build-essential cmake \ + libgeos-dev libjansson-dev libsnappy-dev liblzma-dev libz-dev \ + zlib1g pkg-config libssl-dev gawk - - name: Install TDengine + - name: Build and install TDengine run: | - mkdir debug - cd debug - cmake .. -DBUILD_HTTP=false -DBUILD_JDBC=false -DBUILD_TOOLS=true -DBUILD_TEST=off -DBUILD_KEEPER=true -DBUILD_DEPENDENCY_TESTS=false + mkdir debug && cd debug + cmake .. -DBUILD_HTTP=false -DBUILD_JDBC=false \ + -DBUILD_TOOLS=true -DBUILD_TEST=off \ + -DBUILD_KEEPER=true -DBUILD_DEPENDENCY_TESTS=false make -j 4 sudo make install which taosd