Merge branch 'main' into merge/mainto3.0

This commit is contained in:
Simon Guan 2025-03-17 21:43:11 +08:00
commit a2089da27f
3 changed files with 27 additions and 58 deletions

View File

@ -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 }}

View File

@ -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,27 @@ 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: ${{ 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: ${{ 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: ${{ 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 }}

View File

@ -97,7 +97,6 @@ CSV 文件中的每个 Row 配置一个 OPC 数据点位。Row 的规则如下
(1) 与 Header 中的列有如下对应关系
| 序号 | Header 中的列 | 值的类型 | 值的范围 | 是否必填 | 默认值 |
|----|-------------------------| -------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|--------------|
| 1 | tag_name | String | 类似`root.parent.temperature`这样的字符串,要满足 OPC DA 的 ID 规范 | 是 | |