From ed98b27db85118183daabd67391d4f53253e49de Mon Sep 17 00:00:00 2001 From: Feng Chao Date: Mon, 17 Mar 2025 13:46:19 +0800 Subject: [PATCH 1/3] update workflow to handle the two mode with different step --- .github/workflows/tdengine-test.yml | 57 +++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tdengine-test.yml b/.github/workflows/tdengine-test.yml index 1178e393e9..3aeb1368f9 100644 --- a/.github/workflows/tdengine-test.yml +++ b/.github/workflows/tdengine-test.yml @@ -17,9 +17,23 @@ on: - 'tests/parallel/tdgpt_cases.task' - 'tests/script/tsim/analytics' - '**/*.md' + workflow_dispatch: + inputs: + specified_source_branch: + description: 'Enter the source branch name of TDengine' + required: true + type: string + specified_target_branch: + description: 'Enter the target branch name of TDengine' + required: true + type: string + specified_pr_number: + description: 'Enter the PR number of TDengine' + required: true + type: string concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number }}-TDengine + group: ${{ github.workflow }}-${{ github.event.pull_request.number }}-${{ github.event.inputs.specified_target_branch }}-${{ github.event.inputs.specified_pr_number }}-TDengine cancel-in-progress: true env: @@ -28,17 +42,54 @@ env: jobs: run-tests-on-linux: uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@main + if: ${{ github.event_name == 'pull_request' }} with: tdinternal: false - run_function_test: true - run_tdgpt_test: false + specified_source_branch: 'unavailable' + specified_target_branch: 'unavailable' + specified_pr_number: 'unavailable' + + run-tests-on-linux-manually: + uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@main + if: ${{ github.event_name == 'workflow_dispatch' }} + with: + tdinternal: false + specified_source_branch: ${{ github.event.inputs.specified_source_branch }} + specified_target_branch: ${{ github.event.inputs.specified_target_branch }} + specified_pr_number: ${{ github.event.inputs.specified_pr_number }} run-tests-on-mac: uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml@main + if: ${{ github.event_name == 'pull_request' }} with: tdinternal: false + specified_source_branch: 'unavailable' + specified_target_branch: 'unavailable' + specified_pr_number: 'unavailable' + + run-tests-on-mac-munually: + uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml@main + if: ${{ github.event_name == 'workflow_dispatch' }} + with: + tdinternal: false + specified_source_branch: ${{ github.event.inputs.specified_source_branch }} + specified_target_branch: ${{ github.event.inputs.specified_target_branch }} + specified_pr_number: ${{ github.event.inputs.specified_pr_number }} run-tests-on-windows: uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml@main + if: ${{ github.event_name == 'pull_request' }} with: tdinternal: false + specified_source_branch: 'unavailable' + specified_target_branch: 'unavailable' + specified_pr_number: 'unavailable' + + run-tests-on-windows-manually: + uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml@main + if: ${{ github.event_name == 'workflow_dispatch' }} + with: + tdinternal: false + specified_source_branch: ${{ github.event.inputs.specified_source_branch }} + specified_target_branch: ${{ github.event.inputs.specified_target_branch }} + specified_pr_number: ${{ github.event.inputs.specified_pr_number }} From 7b193d515a310f71b1131eca07bbc05615f491b2 Mon Sep 17 00:00:00 2001 From: Feng Chao Date: Mon, 17 Mar 2025 15:47:46 +0800 Subject: [PATCH 2/3] ci: remove manual workflow --- .github/workflows/tdengine-test-manual.yml | 54 ---------------------- 1 file changed, 54 deletions(-) delete mode 100644 .github/workflows/tdengine-test-manual.yml diff --git a/.github/workflows/tdengine-test-manual.yml b/.github/workflows/tdengine-test-manual.yml deleted file mode 100644 index be14a6e908..0000000000 --- a/.github/workflows/tdengine-test-manual.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: TDengine Test (Manual) - -on: - workflow_dispatch: - inputs: - specified_source_branch: - description: 'Enter the source branch name of TDengine' - required: false - default: 'unavailable' - type: string - specified_target_branch: - description: 'Enter the target branch name of TDengine' - required: false - default: 'unavailable' - type: string - specified_pr_number: - description: 'Enter the PR number of TDengine' - required: false - default: 'unavailable' - type: string - -concurrency: - group: ${{ github.event.inputs.specified_target_branch }}-${{ github.event.inputs.specified_pr_number }}-TDengine - cancel-in-progress: true - -env: - WKC: '/var/lib/jenkins/workspace/TDinternal/community' - -jobs: - run-tests-on-linux: - uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@ci/test/workflow - with: - tdinternal: false - run_function_test: true - run_tdgpt_test: false - specified_source_branch: ${{ github.event.inputs.specified_source_branch }} - specified_target_branch: ${{ github.event.inputs.specified_target_branch }} - specified_pr_number: ${{ github.event.inputs.specified_pr_number }} - - run-tests-on-mac: - uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml@ci/test/workflow - with: - tdinternal: false - specified_source_branch: ${{ github.event.inputs.specified_source_branch }} - specified_target_branch: ${{ github.event.inputs.specified_target_branch }} - specified_pr_number: ${{ github.event.inputs.specified_pr_number }} - - run-tests-on-windows: - uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml@ci/test/workflow - with: - tdinternal: false - specified_source_branch: ${{ github.event.inputs.specified_source_branch }} - specified_target_branch: ${{ github.event.inputs.specified_target_branch }} - specified_pr_number: ${{ github.event.inputs.specified_pr_number }} From 3b6173e4f3ef1abd4feda8f8b71aa2375f18df25 Mon Sep 17 00:00:00 2001 From: Feng Chao Date: Mon, 17 Mar 2025 16:32:25 +0800 Subject: [PATCH 3/3] ci: udpate input parameters and remove unusable step --- .github/workflows/tdengine-test.yml | 47 ++++++----------------------- 1 file changed, 10 insertions(+), 37 deletions(-) diff --git a/.github/workflows/tdengine-test.yml b/.github/workflows/tdengine-test.yml index 3aeb1368f9..97f2638e28 100644 --- a/.github/workflows/tdengine-test.yml +++ b/.github/workflows/tdengine-test.yml @@ -42,54 +42,27 @@ env: jobs: run-tests-on-linux: uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@main - if: ${{ github.event_name == 'pull_request' }} + if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'}} with: tdinternal: false - specified_source_branch: 'unavailable' - specified_target_branch: 'unavailable' - specified_pr_number: 'unavailable' - - run-tests-on-linux-manually: - uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@main - if: ${{ github.event_name == 'workflow_dispatch' }} - with: - tdinternal: false - specified_source_branch: ${{ github.event.inputs.specified_source_branch }} - specified_target_branch: ${{ github.event.inputs.specified_target_branch }} - specified_pr_number: ${{ github.event.inputs.specified_pr_number }} + specified_source_branch: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_source_branch }} + specified_target_branch: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_target_branch }} + specified_pr_number: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_pr_number }} run-tests-on-mac: uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml@main if: ${{ github.event_name == 'pull_request' }} with: tdinternal: false - specified_source_branch: 'unavailable' - specified_target_branch: 'unavailable' - specified_pr_number: 'unavailable' - - run-tests-on-mac-munually: - uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml@main - if: ${{ github.event_name == 'workflow_dispatch' }} - with: - tdinternal: false - specified_source_branch: ${{ github.event.inputs.specified_source_branch }} - specified_target_branch: ${{ github.event.inputs.specified_target_branch }} - specified_pr_number: ${{ github.event.inputs.specified_pr_number }} + specified_source_branch: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_source_branch }} + specified_target_branch: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_target_branch }} + specified_pr_number: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_pr_number }} run-tests-on-windows: uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml@main if: ${{ github.event_name == 'pull_request' }} with: tdinternal: false - specified_source_branch: 'unavailable' - specified_target_branch: 'unavailable' - specified_pr_number: 'unavailable' - - run-tests-on-windows-manually: - uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml@main - if: ${{ github.event_name == 'workflow_dispatch' }} - with: - tdinternal: false - specified_source_branch: ${{ github.event.inputs.specified_source_branch }} - specified_target_branch: ${{ github.event.inputs.specified_target_branch }} - specified_pr_number: ${{ github.event.inputs.specified_pr_number }} + specified_source_branch: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_source_branch }} + specified_target_branch: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_target_branch }} + specified_pr_number: ${{ github.event_name == 'pull_request' && 'unavailable' || github.event.inputs.specified_pr_number }}