diff --git a/.github/workflows/taosd-ci.yml b/.github/workflows/taosd-ci.yml index d2c743aac6..c4f18303ee 100644 --- a/.github/workflows/taosd-ci.yml +++ b/.github/workflows/taosd-ci.yml @@ -13,7 +13,7 @@ on: types: [run-tests] concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.event.client_payload.ref}}-${{ github.event_name == 'repository_dispatch' && 'dispatch' || ''}} cancel-in-progress: true env: @@ -88,7 +88,7 @@ jobs: env: IS_TDINTERNAL: ${{ needs.fetch-parameters.outputs.tdinternal }} RUN_RUNCTION_TEST: ${{ needs.fetch-parameters.outputs.run_function_test }} - RUN_TDGPT_TEST: ${{ needs.fetch-parameters.outputs.run_tdgpt_tests }} + RUN_TDGPT_TEST: ${{ needs.fetch-parameters.outputs.run_tdgpt_test }} SOURCE_BRANCH: ${{ needs.fetch-parameters.outputs.source_branch }} TARGET_BRANCH: ${{ needs.fetch-parameters.outputs.target_branch }} PR_NUMBER: ${{ needs.fetch-parameters.outputs.pr_number }} @@ -161,18 +161,18 @@ jobs: cd ${{ env.WKC }} git submodule update --init --recursive - name: Output the 'file_no_doc_changed' information to the file - if: ${{ env.IS_TDINTERNAL == 'false' }} + if: ${{ env.IS_TDINTERNAL == 'false' && env.TARGET_BRANCH != '3.1' }} run: | mkdir -p ${{ env.WKDIR }}/tmp/${{ env.PR_NUMBER }}_${{ github.run_number }} changed_files_non_doc=$(git --no-pager diff --name-only FETCH_HEAD `git merge-base FETCH_HEAD ${{ env.TARGET_BRANCH }}`|grep -v "^docs/en/"|grep -v "^docs/zh/"|grep -v ".md$" | tr '\n' ' ' || :) echo $changed_files_non_doc > ${{ env.WKDIR }}/tmp/${{ env.PR_NUMBER }}_${{ github.run_number }}/docs_changed.txt - name: Check assert testing - if: ${{ env.IS_TDINTERNAL == 'false' }} + if: ${{ env.IS_TDINTERNAL == 'false' && env.TARGET_BRANCH != '3.1' }} run: | cd ${{ env.WKC }}/tests/parallel_test ./run_check_assert_container.sh -d ${{ env.WKDIR }} - name: Check void function testing - if: ${{ env.IS_TDINTERNAL == 'false' }} + if: ${{ env.IS_TDINTERNAL == 'false' && env.TARGET_BRANCH != '3.1' }} run: | cd ${{ env.WKC }}/tests/parallel_test ./run_check_void_container.sh -d ${{ env.WKDIR }} @@ -207,12 +207,12 @@ jobs: echo "timeout_cmd=$timeout_cmd" >> $GITHUB_OUTPUT echo "extra_param=$extra_param" >> $GITHUB_OUTPUT - name: Run function returns with a null pointer scan testing - if: ${{ env.IS_TDINTERNAL == 'false' }} + if: ${{ env.IS_TDINTERNAL == 'false' && env.TARGET_BRANCH != '3.1' }} run: | cd ${{ env.WKC }}/tests/parallel_test ./run_scan_container.sh -d ${{ env.WKDIR }} -b ${{ env.PR_NUMBER }}_${{ github.run_number }} -f ${{ env.WKDIR }}/tmp/${{ env.PR_NUMBER }}_${{ github.run_number }}/docs_changed.txt ${{ steps.get_param.outputs.extra_param }} - name: Run tdgpt test cases - if: ${{ env.IS_TDINTERNAL }} == 'false' && ${{ env.RUN_TDGPT_TEST }} == 'true' + if: ${{ env.IS_TDINTERNAL == 'false' && env.TARGET_BRANCH != '3.1' && env.RUN_TDGPT_TEST == 'true' }} run: | cd ${{ env.WKC }}/tests/parallel_test export DEFAULT_RETRY_TIME=2 @@ -330,9 +330,9 @@ jobs: SOURCE_BRANCH: ${{ needs.fetch-parameters.outputs.source_branch }} TARGET_BRANCH: ${{ needs.fetch-parameters.outputs.target_branch }} PR_NUMBER: ${{ needs.fetch-parameters.outputs.pr_number }} - WIN_INTERNAL_ROOT: "C:\\workspace\\TDinternal" - WIN_COMMUNITY_ROOT: "C:\\workspace\\TDinternal\\community" - WIN_SYSTEM_TEST_ROOT: "C:\\workspace\\TDinternal\\community\\tests\\system-test" + WIN_INTERNAL_ROOT: "C:\\workspace\\0\\TDinternal" + WIN_COMMUNITY_ROOT: "C:\\workspace\\0\\TDinternal\\community" + WIN_SYSTEM_TEST_ROOT: "C:\\workspace\\0\\TDinternal\\community\\tests\\system-test" WIN_VS_PATH: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" WIN_CPU_TYPE: "x64" steps: diff --git a/.github/workflows/taosd-doc-build.yml b/.github/workflows/taosd-doc-build.yml index 1dffaa0aa7..28f1f10835 100644 --- a/.github/workflows/taosd-doc-build.yml +++ b/.github/workflows/taosd-doc-build.yml @@ -5,7 +5,6 @@ on: branches: - 'main' - '3.0' - - '3.1' paths: - 'docs/**' - '*.md'