From 2096d59d9183916ebea963139fed1eb7afc636a0 Mon Sep 17 00:00:00 2001 From: WANG Xu Date: Fri, 14 Mar 2025 14:32:31 +0800 Subject: [PATCH] ci: modify workflow name Signed-off-by: WANG Xu --- .../workflows/cancel-workflow-on-merge.yml | 25 +++++++++ ...eper-ci-build.yml => taoskeeper-build.yml} | 7 ++- ...{taosd-ci-build.yml => tdengine-build.yml} | 6 +-- ...d-doc-build.yml => tdengine-doc-build.yml} | 10 ++-- .github/workflows/tdengine-test-manual.yml | 54 +++++++++++++++++++ .../{taosd-ci.yml => tdengine-test.yml} | 5 +- 6 files changed, 95 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/cancel-workflow-on-merge.yml rename .github/workflows/{taoskeeper-ci-build.yml => taoskeeper-build.yml} (94%) rename .github/workflows/{taosd-ci-build.yml => tdengine-build.yml} (97%) rename .github/workflows/{taosd-doc-build.yml => tdengine-doc-build.yml} (86%) create mode 100644 .github/workflows/tdengine-test-manual.yml rename .github/workflows/{taosd-ci.yml => tdengine-test.yml} (89%) diff --git a/.github/workflows/cancel-workflow-on-merge.yml b/.github/workflows/cancel-workflow-on-merge.yml new file mode 100644 index 0000000000..1c00c4fe9b --- /dev/null +++ b/.github/workflows/cancel-workflow-on-merge.yml @@ -0,0 +1,25 @@ +name: Cancel Workflow on Merge + +on: + pull_request: + types: [closed] + +jobs: + cancel-workflow: + runs-on: ubuntu-latest + steps: + - name: Cancel Workflow if Merged or Closed + if: ${{ github.event.pull_request.merged || github.event.pull_request.state == 'closed' }} + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + echo "PR has been merged or closed, cancelling workflow..." + gh auth status + gh run list \ + --repo ${{ github.repository }} \ + --branch ${{ github.event.pull_request.head.ref }} \ + --workflow "TDengine Test" \ + --status in_progress \ + --status queued \ + --json databaseId --jq '.[].databaseId' | \ + xargs -I {} gh run cancel --repo ${{ github.repository }} {} \ No newline at end of file diff --git a/.github/workflows/taoskeeper-ci-build.yml b/.github/workflows/taoskeeper-build.yml similarity index 94% rename from .github/workflows/taoskeeper-ci-build.yml rename to .github/workflows/taoskeeper-build.yml index 71bb1c9a51..cd1205dee5 100644 --- a/.github/workflows/taoskeeper-ci-build.yml +++ b/.github/workflows/taoskeeper-build.yml @@ -1,9 +1,12 @@ name: taosKeeper Build on: - push: + pull_request: + branches: + - 'main' + - '3.0' paths: - - tools/keeper/** + - 'tools/keeper/**' jobs: build: diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/tdengine-build.yml similarity index 97% rename from .github/workflows/taosd-ci-build.yml rename to .github/workflows/tdengine-build.yml index 2179200bb3..2a71cae71c 100644 --- a/.github/workflows/taosd-ci-build.yml +++ b/.github/workflows/tdengine-build.yml @@ -8,12 +8,11 @@ on: - '3.1' - '3.3.6' - 'enh/cmake-TD-33848' - paths-ignore: - 'docs/**' - 'packaging/**' - 'tests/**' - - '*.md' + - '**/*.md' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -21,9 +20,10 @@ concurrency: jobs: build: - name: Build and test on ${{ matrix.os }} + name: Run on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: - ubuntu-20.04 diff --git a/.github/workflows/taosd-doc-build.yml b/.github/workflows/tdengine-doc-build.yml similarity index 86% rename from .github/workflows/taosd-doc-build.yml rename to .github/workflows/tdengine-doc-build.yml index 3ac922820a..63266161f4 100644 --- a/.github/workflows/taosd-doc-build.yml +++ b/.github/workflows/tdengine-doc-build.yml @@ -9,11 +9,11 @@ on: - 'docs/**' env: - DOC_WKC: "/root/doc_ci_work" - ZH_DOC_REPO: "docs.taosdata.com" - EN_DOC_REPO: "docs.tdengine.com" - TD_REPO: "TDengine" - TOOLS_REPO: "taos-tools" + DOC_WKC: '/root/doc_ci_work' + ZH_DOC_REPO: 'docs.taosdata.com' + EN_DOC_REPO: 'docs.tdengine.com' + TD_REPO: 'TDengine' + TOOLS_REPO: 'taos-tools' jobs: build-doc: diff --git a/.github/workflows/tdengine-test-manual.yml b/.github/workflows/tdengine-test-manual.yml new file mode 100644 index 0000000000..be14a6e908 --- /dev/null +++ b/.github/workflows/tdengine-test-manual.yml @@ -0,0 +1,54 @@ +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 }} diff --git a/.github/workflows/taosd-ci.yml b/.github/workflows/tdengine-test.yml similarity index 89% rename from .github/workflows/taosd-ci.yml rename to .github/workflows/tdengine-test.yml index 7f6dc5d3d7..1178e393e9 100644 --- a/.github/workflows/taosd-ci.yml +++ b/.github/workflows/tdengine-test.yml @@ -1,4 +1,4 @@ -name: TDengine CI Test +name: TDengine Test on: pull_request: @@ -16,9 +16,10 @@ on: - 'source/common/src/tanalytics.c' - 'tests/parallel/tdgpt_cases.task' - 'tests/script/tsim/analytics' + - '**/*.md' concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-TDengine + group: ${{ github.workflow }}-${{ github.event.pull_request.number }}-TDengine cancel-in-progress: true env: