Merge branch 'stolostron:main' into ACM-9895

stolostron · Mar 11, 2024 · 0ae8237 · 0ae8237
2 parents e161998 + 60b413b
commit 0ae8237
Show file tree

Hide file tree

Showing 10 changed files with 1,075 additions and 153 deletions.
diff --git a/.github/workflows/repo-config.yml b/.github/workflows/repo-config.yml
@@ -70,11 +70,15 @@ jobs:
           echo "CI_ICON=${CI_ICON}" >> ${GITHUB_ENV}
           echo "## :${CI_ICON}: CI Check" >> ${GITHUB_STEP_SUMMARY}
           echo "" >> ${GITHUB_STEP_SUMMARY}
-          echo "<details><summary>See more</summary>" >> ${GITHUB_STEP_SUMMARY}
-          echo "" >> ${GITHUB_STEP_SUMMARY}
-          echo -e "${CI_SUMMARY}" >> ${GITHUB_STEP_SUMMARY}
-          echo "" >> ${GITHUB_STEP_SUMMARY}
-          echo "</details>" >> ${GITHUB_STEP_SUMMARY}
+          if [[ -f ci-errors.log ]]; then
+            echo "<details><summary>See more</summary>" >> ${GITHUB_STEP_SUMMARY}
+            echo "" >> ${GITHUB_STEP_SUMMARY}
+            echo '```' >> ${GITHUB_STEP_SUMMARY}
+            cat ci-errors.log >> ${GITHUB_STEP_SUMMARY}
+            echo '```' >> ${GITHUB_STEP_SUMMARY}
+            echo "" >> ${GITHUB_STEP_SUMMARY}
+            echo "</details>" >> ${GITHUB_STEP_SUMMARY}
+          fi
           echo "" >> ${GITHUB_STEP_SUMMARY}
 
           CODEBASE_ICON=${SUCCESS_ICON}
@@ -86,11 +90,15 @@ jobs:
           echo "CODEBASE_ICON=${CODEBASE_ICON}" >> ${GITHUB_ENV}
           echo "## :${CODEBASE_ICON}: Codebase Check" >> ${GITHUB_STEP_SUMMARY}
           echo "" >> ${GITHUB_STEP_SUMMARY}
-          echo "<details><summary>See more</summary>" >> ${GITHUB_STEP_SUMMARY}
-          echo "" >> ${GITHUB_STEP_SUMMARY}
-          echo -e "${CODEBASE_SUMMARY}" >> ${GITHUB_STEP_SUMMARY}
-          echo "" >> ${GITHUB_STEP_SUMMARY}
-          echo "</details>" >> ${GITHUB_STEP_SUMMARY}
+          if [[ -f codebase-errors.log ]]; then
+            echo "<details><summary>See more</summary>" >> ${GITHUB_STEP_SUMMARY}
+            echo "" >> ${GITHUB_STEP_SUMMARY}
+            echo '```' >> ${GITHUB_STEP_SUMMARY}
+            cat codebase-errors.log >> ${GITHUB_STEP_SUMMARY}
+            echo '```' >> ${GITHUB_STEP_SUMMARY}
+            echo "" >> ${GITHUB_STEP_SUMMARY}
+            echo "</details>" >> ${GITHUB_STEP_SUMMARY}
+          fi
 
       - name: Send result to Slack
         id: slack

diff --git a/build/pull-requests.sh b/build/pull-requests.sh
@@ -13,10 +13,10 @@ for org in "${ORGS[@]}"; do
   query+="+org:${org}"
 done
 
-format='"\(if (.title | length) <= 50 then .title else (.title[0:47] + "...") end)\t'
-format+='\(.user.login)\t'
+format='"\(if (.title | length) <= 40 then .title else (.title[0:37] + "...") end)\t'
+format+='\(.user.login[0:10])\t'
 format+='\(.created_at[0:10])\t'
-format+='\(.html_url | ltrimstr("https://"))"'
+format+='\(.html_url)"'
 
 title="# GRC PR report for $(date) #"
 border=$(echo "${title}" | sed 's/./#/g')