From 2909b2c84a4aac39daf9d53a0f94e2d5c2871b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Proch=C3=A1zka?= <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Wed, 23 Oct 2024 08:51:07 +0200 Subject: [PATCH] fix(ci): Fix boards test more logs more logs more logs --- .github/scripts/find_new_boards.sh | 40 ++++++++---------------------- .github/workflows/boards.yml | 2 +- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/.github/scripts/find_new_boards.sh b/.github/scripts/find_new_boards.sh index c2db23d41c7..706676b4a4c 100755 --- a/.github/scripts/find_new_boards.sh +++ b/.github/scripts/find_new_boards.sh @@ -2,39 +2,29 @@ # Get inputs from command owner_repository=$1 -pr_number=$2 +base_ref=$2 -url="https://api.github.com/repos/$owner_repository/pulls/$pr_number/files" -echo $url +# Download the boards.txt file from the base branch +curl -L -o boards_base.txt https://raw.githubusercontent.com/$owner_repository/$base_ref/boards.txt -# Get changes in boards.txt file from PR -Boards_modified_url=$(curl -s $url | jq -r '.[] | select(.filename == "boards.txt") | .raw_url') +# Compare boards.txt file in the repo with the modified file from PR +diff=$(diff -u boards_base.txt boards.txt) -# Echo the modified boards.txt file URL -echo "Modified boards.txt file URL:" -echo $Boards_modified_url - -# Download the modified boards.txt file -curl -L -o boards_pr.txt $Boards_modified_url - -# Check if the file is downloaded -if [ ! -f boards_pr.txt ] +# Check if the diff is empty +if [ -z "$diff" ] then - echo "Error: boards.txt file not downloaded" - exit 1 + echo "No changes in boards.txt file" + echo "FQBNS=" + exit 0 fi -# Compare boards.txt file in the repo with the modified file -diff=$(diff -u boards.txt boards_pr.txt) - # Extract added or modified lines (lines starting with '+' or '-') modified_lines=$(echo "$diff" | grep -E '^[+-][^+-]') -# Print the modified lines +# Print the modified lines for debugging echo "Modified lines:" echo "$modified_lines" - boards_array=() previous_board="" @@ -55,14 +45,6 @@ do fi done <<< "$modified_lines" -# Print all boards found -echo "Boards found:" -for board in ${boards_array[@]} -do - echo $board -done - - # Create JSON like string with all boards found and pass it to env variable board_count=${#boards_array[@]} diff --git a/.github/workflows/boards.yml b/.github/workflows/boards.yml index 8d5868b083b..a14f57508c6 100644 --- a/.github/workflows/boards.yml +++ b/.github/workflows/boards.yml @@ -29,7 +29,7 @@ jobs: - name: Get board name run: - bash .github/scripts/find_new_boards.sh ${{ github.repository }} ${{github.event.number}} + bash .github/scripts/find_new_boards.sh ${{ github.repository }} ${{github.base_ref}} test-boards: needs: find-boards