From 70f53519c1a151ed7aa0fec67c785cf2175030cb Mon Sep 17 00:00:00 2001 From: Feng Chao Date: Sat, 8 Mar 2025 12:13:55 +0800 Subject: [PATCH 1/2] ci: udpate ci workflow to debug tdgpt and function test condition --- .github/workflows/taosd-ci.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/taosd-ci.yml b/.github/workflows/taosd-ci.yml index e2ad890105..7ce0a5ce48 100644 --- a/.github/workflows/taosd-ci.yml +++ b/.github/workflows/taosd-ci.yml @@ -10,7 +10,7 @@ on: - 'packaging/**' - 'docs/**' repository_dispatch: - types: [run-tests] + types: [trigger-tests-from-tdinternal] concurrency: group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.event.client_payload.ref}}-${{ github.event_name == 'repository_dispatch' && 'dispatch' || ''}} @@ -55,21 +55,29 @@ jobs: # check whether to run tdgpt test cases cd ${{ env.WKC }} - changed_files_non_doc=$(git --no-pager diff --name-only FETCH_HEAD `git merge-base FETCH_HEAD $target_branch`|grep -v "^docs/en/"|grep -v "^docs/zh/"|grep -v ".md$" | tr '\n' ' ' || :) - - if [[ "$changed_files_non_doc" != '' && "$changed_files_non_doc" =~ /forecastoperator.c|anomalywindowoperator.c|tanalytics.h|tanalytics.c|tdgpt_cases.task|analytics|tdgpt/ ]]; then + changed_files_non_doc=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD $target_branch) | grep -v "^docs/en/" | grep -v "^docs/zh/" | grep -v ".md$" | tr '\n' ' ' || :) + echo “changed files exclude doc, ${changed_files_non_doc}" + if [[ -n "$changed_files_non_doc" && "$changed_files_non_doc" =~ (forecastoperator\.c|anomalywindowoperator\.c|tanalytics\.h|tanalytics\.c|tdgpt_cases\.task|analytics|tdgpt) ]]; then run_tdgpt_test="true" else run_tdgpt_test="false" fi + echo "run tdgpt test: ${run_tdgpt_test}" # check whether to run function test cases - changed_files_non_tdgpt=$(git --no-pager diff --name-only FETCH_HEAD `git merge-base FETCH_HEAD $target_branch`|grep -v "^docs/en/"|grep -v "^docs/zh/"|grep -v ".md$" | grep -Ev "forecastoperator.c|anomalywindowoperator.c|tanalytics.h|tanalytics.c|tdgpt_cases.task|analytics|tdgpt" | tr '\n' ' ' ||:) - if [ "$changed_files_non_tdgpt" != '' ]; then + changed_files_non_tdgpt=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD $target_branch) | \ + grep -v "^docs/en/" | \ + grep -v "^docs/zh/" | \ + grep -v ".md$" | \ + grep -Ev "forecastoperator\.c|anomalywindowoperator\.c|tanalytics\.h|tanalytics\.c|tdgpt_cases\.task|analytics|tdgpt" | \ + tr '\n' ' ' || :) + echo "changed file exclude tdgpt: ${changed_files_non_tdgpt}" + if [ -n "$changed_files_non_tdgpt" ]; then run_function_test="true" else run_function_test="false" fi + echo "run function test: ${run_function_test}" fi echo "tdinternal=$tdinternal" >> $GITHUB_OUTPUT From 96db60838b194f4d6c6c538d9566f834e02a20b8 Mon Sep 17 00:00:00 2001 From: WANG Xu Date: Sat, 8 Mar 2025 18:43:30 +0800 Subject: [PATCH 2/2] docs: fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 672685dcef..f7db2a7ea2 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ If you want to compile taosAdapter or taosKeeper, you need to install Go 1.18 or ### For Ubuntu 18.04、20.04、22.04 ```bash -sudo apt-get udpate +sudo apt-get update sudo apt-get install -y gcc cmake build-essential git libjansson-dev \ libsnappy-dev liblzma-dev zlib1g-dev pkg-config ```