From 9e1f237ebbc0aca8e86cbce52466d519faf26636 Mon Sep 17 00:00:00 2001 From: Feng Chao Date: Sat, 15 Mar 2025 10:50:57 +0800 Subject: [PATCH 1/3] ci: fix function returns test issue due to docs_changed.txt not found --- .github/workflows/tdgpt-test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/tdgpt-test.yml b/.github/workflows/tdgpt-test.yml index 48962141d8..07ae1ef9f0 100644 --- a/.github/workflows/tdgpt-test.yml +++ b/.github/workflows/tdgpt-test.yml @@ -122,6 +122,13 @@ jobs: cd ${{ env.WKC }} git submodule update --init --recursive + - name: Output the 'file_no_doc_changed' information to the file + run: | + mkdir -p ${{ env.WKDIR }}/tmp/${{ env.PR_NUMBER }}_${{ github.run_number }} + cd ${{ env.WKC }} + 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 run: | cd ${{ env.WKC }}/tests/parallel_test From 0ba6c84a28ff53a38852774fcd12c4aa4f28abea Mon Sep 17 00:00:00 2001 From: Feng Chao Date: Sat, 15 Mar 2025 11:32:11 +0800 Subject: [PATCH 2/3] Update .github/workflows/tdgpt-test.yml Co-authored-by: WANG Xu --- .github/workflows/tdgpt-test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tdgpt-test.yml b/.github/workflows/tdgpt-test.yml index 07ae1ef9f0..b6d5a0075f 100644 --- a/.github/workflows/tdgpt-test.yml +++ b/.github/workflows/tdgpt-test.yml @@ -126,7 +126,12 @@ jobs: run: | mkdir -p ${{ env.WKDIR }}/tmp/${{ env.PR_NUMBER }}_${{ github.run_number }} cd ${{ env.WKC }} - 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' ' ' || :) + 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 From 974d3c11884ef9bcf480c1500074276b378c0063 Mon Sep 17 00:00:00 2001 From: WANG Xu Date: Sat, 15 Mar 2025 11:43:29 +0800 Subject: [PATCH 3/3] refactor: readability --- .github/workflows/tdgpt-test.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tdgpt-test.yml b/.github/workflows/tdgpt-test.yml index b6d5a0075f..e4882bfef1 100644 --- a/.github/workflows/tdgpt-test.yml +++ b/.github/workflows/tdgpt-test.yml @@ -122,17 +122,20 @@ jobs: cd ${{ env.WKC }} git submodule update --init --recursive - - name: Output the 'file_no_doc_changed' information to the file + - name: Detect non-doc files changed run: | mkdir -p ${{ env.WKDIR }}/tmp/${{ env.PR_NUMBER }}_${{ github.run_number }} cd ${{ env.WKC }} - changed_files_non_doc=$(git --no-pager diff --name-only FETCH_HEAD \ + 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' ' ' || : \ + grep -v ".md$" | \ + tr '\n' ' ' || : \ ) - echo $changed_files_non_doc > ${{ env.WKDIR }}/tmp/${{ env.PR_NUMBER }}_${{ github.run_number }}/docs_changed.txt + echo $changed_files_non_doc > \ + ${{ env.WKDIR }}/tmp/${{ env.PR_NUMBER }}_${{ github.run_number }}/non_docs_changed.txt - name: Check assert testing run: | @@ -181,7 +184,7 @@ jobs: ./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 \ + -f ${{ env.WKDIR }}/tmp/${{ env.PR_NUMBER }}_${{ github.run_number }}/non_docs_changed.txt \ ${{ steps.get_param.outputs.extra_param }} - name: Run tdgpt test cases