From cbe998f174c9e864a4f09751e6739159f948bf02 Mon Sep 17 00:00:00 2001 From: Feng Chao Date: Mon, 10 Mar 2025 09:55:01 +0800 Subject: [PATCH 1/2] ci: Update reusable workflow branch name --- .github/workflows/taosd-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/taosd-ci.yml b/.github/workflows/taosd-ci.yml index b7b97cee8e..ee0df00d49 100644 --- a/.github/workflows/taosd-ci.yml +++ b/.github/workflows/taosd-ci.yml @@ -70,7 +70,7 @@ jobs: echo ${{ github.event.pull_request.number }} run-tests-on-linux: - uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml + uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@main needs: fetch-parameters if: ${{ needs.fetch-parameters.outputs.run_tdgpt_test == 'true' || needs.fetch-parameters.outputs.run_function_test == 'true' }} with: @@ -82,7 +82,7 @@ jobs: pr_number: ${{ github.event.pull_request.number }} run-tests-on-mac: - uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml + uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml@main needs: fetch-parameters if: ${{ needs.fetch-parameters.outputs.run_function_test == 'true' }} with: @@ -92,7 +92,7 @@ jobs: pr_number: ${{ github.event.pull_request.number }} run-tests-on-windows: - uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml + uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml@main needs: fetch-parameters if: ${{ needs.fetch-parameters.outputs.run_function_test == 'true' }} with: From 05624d052a00cead7aef627b2a224c14e9f54675 Mon Sep 17 00:00:00 2001 From: Feng Chao Date: Mon, 10 Mar 2025 11:39:04 +0800 Subject: [PATCH 2/2] ci: Update taosd-ci.yml Remove github env params --- .github/workflows/taosd-ci.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/taosd-ci.yml b/.github/workflows/taosd-ci.yml index ee0df00d49..31eda597ad 100644 --- a/.github/workflows/taosd-ci.yml +++ b/.github/workflows/taosd-ci.yml @@ -75,11 +75,8 @@ jobs: if: ${{ needs.fetch-parameters.outputs.run_tdgpt_test == 'true' || needs.fetch-parameters.outputs.run_function_test == 'true' }} with: tdinternal: false - run_function_test: ${{ needs.fetch-parameters.outputs.run_function_test == 'true' || false }} - run_tdgpt_test: ${{ needs.fetch-parameters.outputs.run_tdgpt_test == 'true' || false }} - source_branch: ${{ github.event.pull_request.head.ref }} - target_branch: ${{ github.event.pull_request.base.ref }} - pr_number: ${{ github.event.pull_request.number }} + run_function_test: ${{ needs.fetch-parameters.outputs.run_function_test == 'true' }} + run_tdgpt_test: ${{ needs.fetch-parameters.outputs.run_tdgpt_test == 'true' }} run-tests-on-mac: uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml@main @@ -87,9 +84,6 @@ jobs: if: ${{ needs.fetch-parameters.outputs.run_function_test == 'true' }} with: tdinternal: false - source_branch: ${{ github.event.pull_request.head.ref }} - target_branch: ${{ github.event.pull_request.base.ref }} - pr_number: ${{ github.event.pull_request.number }} run-tests-on-windows: uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml@main @@ -97,6 +91,3 @@ jobs: if: ${{ needs.fetch-parameters.outputs.run_function_test == 'true' }} with: tdinternal: false - source_branch: ${{ github.event.pull_request.head.ref }} - target_branch: ${{ github.event.pull_request.base.ref }} - pr_number: ${{ github.event.pull_request.number }}