From 325d46799aeb33524df2fa87e58f6104ce04e410 Mon Sep 17 00:00:00 2001 From: Ayushi Agrawal <88406934+ayushi-agrawal-gladstone@users.noreply.github.com> Date: Wed, 2 Oct 2024 10:36:52 -0700 Subject: [PATCH] :hammer_and_wrench: indentation --- .github/workflows/1_on_pull_request.yml | 182 ++++++++++++------------ 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/.github/workflows/1_on_pull_request.yml b/.github/workflows/1_on_pull_request.yml index 2178b78e..e91aa8f2 100644 --- a/.github/workflows/1_on_pull_request.yml +++ b/.github/workflows/1_on_pull_request.yml @@ -872,102 +872,102 @@ jobs: fi fi - - name: Check for deleted, added, and modified nodes - run: | - # Read the diff output from the file - diff_output=$(cat diff_output.txt) - - # Check if the GPML file is new - status="${{ env.STATUS }}" - - if [ "$status" = "New" ]; then - # For new GPML files, treat all nodes as added nodes - added_nodes=$(grep '> $GITHUB_ENV - echo "status_test_nodes=PASS" >> $GITHUB_ENV - echo "color_test_nodes=green" >> $GITHUB_ENV - - else - # For modified GPML files, proceed with checking deleted, added, and modified nodes - # Extract nodes that were removed from the GPML file (lines starting with '-') - deleted_nodes=$(echo "$diff_output" | grep "^-" | grep '> $GITHUB_ENV + echo "status_test_nodes=PASS" >> $GITHUB_ENV + echo "color_test_nodes=green" >> $GITHUB_ENV + + else + # For modified GPML files, proceed with checking deleted, added, and modified nodes + # Extract nodes that were removed from the GPML file (lines starting with '-') + deleted_nodes=$(echo "$diff_output" | grep "^-" | grep '> $GITHUB_ENV - echo "status_test_nodes=PASS" >> $GITHUB_ENV - echo "color_test_nodes=green" >> $GITHUB_ENV - else - # Nodes were changed, review required - echo "Review required." - [ "$num_deleted_nodes" -gt 0 ] && echo "Deleted nodes: $num_deleted_nodes" - [ "$num_modified_nodes" -gt 0 ] && echo "Modified nodes: $num_modified_nodes" - [ "$num_added_nodes" -gt 0 ] && echo "Added nodes: $num_added_nodes" + fi + done <<< "$deleted_nodes" - review_note="" - [ "$num_deleted_nodes" -gt 0 ] && review_note+="Deleted nodes: $num_deleted_nodes\n" - [ "$num_modified_nodes" -gt 0 ] && review_note+="Modified nodes: $num_modified_nodes\n" - [ "$num_added_nodes" -gt 0 ] && review_note+="Added nodes: $num_added_nodes\n" + # Safely remove modified nodes from deleted nodes + if [ -n "$modified_nodes" ]; then + safe_modified_nodes=$(echo "$modified_nodes" | sed '/^$/d' | sed 's/[\/&]/\\&/g') + actual_deleted_nodes=$(echo "$deleted_nodes" | grep -vF "$safe_modified_nodes") + else + actual_deleted_nodes="$deleted_nodes" + fi - echo "note_test_nodes=$review_note" >> $GITHUB_ENV - echo "status_test_nodes=REVIEW REQUIRED" >> $GITHUB_ENV - echo "color_test_nodes=red" >> $GITHUB_ENV - fi - fi - - - # Store the deleted, modified, and added nodes as environment variables for later use - echo "deleted_nodes=${deleted_nodes}" >> $GITHUB_ENV - echo "modified_nodes=${modified_nodes}" >> $GITHUB_ENV - echo "added_nodes=${added_or_modified_nodes}" >> $GITHUB_ENV + # Count the number of nodes + num_deleted_nodes=$(echo "$actual_deleted_nodes" | sed '/^$/d' | wc -l) + num_modified_nodes=$(echo "$modified_nodes" | sed '/^$/d' | wc -l) + num_added_nodes=$(echo "$added_or_modified_nodes" | grep -vF "$modified_nodes" | sed '/^$/d' | wc -l) + + # Output the results for modified GPML file + echo "Summary:" + echo "Deleted nodes: $num_deleted_nodes" + echo "Modified nodes: $num_modified_nodes" + echo "Added nodes: $num_added_nodes" + + # Determine pass or review required and report + if [ "$num_deleted_nodes" -eq 0 ] && [ "$num_modified_nodes" -eq 0 ] && [ "$num_added_nodes" -eq 0 ]; then + # No changes, pass + echo "No nodes were deleted, modified, or added." + echo "note_test_nodes=No nodes were deleted, modified, or added." >> $GITHUB_ENV + echo "status_test_nodes=PASS" >> $GITHUB_ENV + echo "color_test_nodes=green" >> $GITHUB_ENV + else + # Nodes were changed, review required + echo "Review required." + [ "$num_deleted_nodes" -gt 0 ] && echo "Deleted nodes: $num_deleted_nodes" + [ "$num_modified_nodes" -gt 0 ] && echo "Modified nodes: $num_modified_nodes" + [ "$num_added_nodes" -gt 0 ] && echo "Added nodes: $num_added_nodes" + + review_note="" + [ "$num_deleted_nodes" -gt 0 ] && review_note+="Deleted nodes: $num_deleted_nodes\n" + [ "$num_modified_nodes" -gt 0 ] && review_note+="Modified nodes: $num_modified_nodes\n" + [ "$num_added_nodes" -gt 0 ] && review_note+="Added nodes: $num_added_nodes\n" + + echo "note_test_nodes=$review_note" >> $GITHUB_ENV + echo "status_test_nodes=REVIEW REQUIRED" >> $GITHUB_ENV + echo "color_test_nodes=red" >> $GITHUB_ENV + fi + fi + + + # Store the deleted, modified, and added nodes as environment variables for later use + echo "deleted_nodes=${deleted_nodes}" >> $GITHUB_ENV + echo "modified_nodes=${modified_nodes}" >> $GITHUB_ENV + echo "added_nodes=${added_or_modified_nodes}" >> $GITHUB_ENV - name: Report on testing id: report