Skip to content

Commit 959b7e2

Browse files
committed
revert: āŖ Revert fix: šŸ› Improve error handling and output formatting for Meson setup and compile failures since it's unrelated to this PR
1 parent 6b04da7 commit 959b7e2

File tree

1 file changed

+37
-44
lines changed

1 file changed

+37
-44
lines changed

ā€Žbuild-tools/build.shā€Ž

Lines changed: 37 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,18 @@ echo "Meson setup exit code: $meson_exit_code"
3535
if [ $meson_exit_code -ne 0 ]; then
3636
echo "Meson setup failed. Please check the logs for more information."
3737
if [ "$INPUT_WRITE_JOB_SUMMARY" == "true" ]; then
38-
{
39-
echo "Meson setup failed. Please check the logs for more information. "
40-
echo "***"
41-
echo "<details><summary>Click to expand</summary> "
42-
echo " "
43-
echo "\`\`\` "
44-
echo " "
45-
cat $COMPILE_STD_OUTPUT
46-
echo " "
47-
echo "\`\`\` "
48-
echo " "
49-
echo "</details> "
50-
} >> $GITHUB_STEP_SUMMARY
38+
echo "# šŸ›‘ Meson Setup Failed " > $GITHUB_STEP_SUMMARY
39+
echo "Meson setup failed. Please check the logs for more information. " >> $GITHUB_STEP_SUMMARY
40+
echo "***" >> $GITHUB_STEP_SUMMARY
41+
echo "<details><summary>Click to expand</summary> " >> $GITHUB_STEP_SUMMARY
42+
echo " " >> $GITHUB_STEP_SUMMARY
43+
echo "\`\`\` " >> $GITHUB_STEP_SUMMARY
44+
echo " " >> $GITHUB_STEP_SUMMARY
45+
cat $COMPILE_STD_OUTPUT >> $GITHUB_STEP_SUMMARY
46+
echo " " >> $GITHUB_STEP_SUMMARY
47+
echo "\`\`\` " >> $GITHUB_STEP_SUMMARY
48+
echo " " >> $GITHUB_STEP_SUMMARY
49+
echo "</details> " >> $GITHUB_STEP_SUMMARY
5150
fi
5251
echo "::endgroup::"
5352
exit 1
@@ -75,25 +74,21 @@ STD_EDITED_OUTPUT=$(mktemp)
7574
sed -r "s/\x1B\[([0-9]{1,3}(;[0-9]{1,2};?)?)?[mGK]//g" $STD_OUTPUT >$STD_EDITED_OUTPUT
7675

7776
if [ $meson_exit_code -ne 0 ]; then
78-
7977
if [ "$INPUT_WRITE_JOB_SUMMARY" == "true" ]; then
80-
{
81-
echo "# šŸ›‘ Meson Compile Failed "
82-
echo "Meson compile failed in $elapsed_time seconds. Please check the logs for more information. "
83-
echo "***"
84-
echo "<details><summary>Click to expand</summary> "
85-
echo " "
86-
echo "\`\`\`\n "
87-
echo " "
88-
cat $STD_EDITED_OUTPUT
89-
echo " "
90-
echo "\`\`\`\n "
91-
echo " "
92-
echo "</details> "
93-
}>> $GITHUB_STEP_SUMMARY
78+
echo "Meson compile failed. Please check the logs for more information."
79+
echo "# šŸ›‘ Meson Compile Failed " > $GITHUB_STEP_SUMMARY
80+
echo "Meson compile failed in $elapsed_time seconds. Please check the logs for more information. " >> $GITHUB_STEP_SUMMARY
81+
echo "***" >> $GITHUB_STEP_SUMMARY
82+
echo "<details><summary>Click to expand</summary> " >> $GITHUB_STEP_SUMMARY
83+
echo " " >> $GITHUB_STEP_SUMMARY
84+
echo "\`\`\`\n " >> $GITHUB_STEP_SUMMARY
85+
echo " " >> $GITHUB_STEP_SUMMARY
86+
cat $STD_EDITED_OUTPUT >> $GITHUB_STEP_SUMMARY
87+
echo " " >> $GITHUB_STEP_SUMMARY
88+
echo "\`\`\`\n " >> $GITHUB_STEP_SUMMARY
89+
echo " " >> $GITHUB_STEP_SUMMARY
90+
echo "</details> " >> $GITHUB_STEP_SUMMARY
9491
fi
95-
echo "::endgroup::"
96-
echo "Meson compile failed. Please check the above group for more information."
9792
exit 1
9893
fi
9994
echo "::endgroup::"
@@ -107,18 +102,16 @@ echo "The build took $elapsed_time seconds"
107102

108103
# job summary
109104
if [ "$INPUT_WRITE_JOB_SUMMARY" == "true" ]; then
110-
{
111-
echo "# āœ… Build Successful "
112-
echo "The build was successful and took $elapsed_time seconds. "
113-
echo "***"
114-
echo "<details><summary>Click to expand</summary> "
115-
echo " "
116-
echo "\`\`\` "
117-
echo " "
118-
cat $STD_EDITED_OUTPUT
119-
echo " "
120-
echo "\`\`\` "
121-
echo " "
122-
echo "</details> "
123-
} >> $GITHUB_STEP_SUMMARY
105+
echo "# āœ… Build Successful " > $GITHUB_STEP_SUMMARY
106+
echo "The build was successful and took $elapsed_time seconds. " >> $GITHUB_STEP_SUMMARY
107+
echo "***" >> $GITHUB_STEP_SUMMARY
108+
echo "<details><summary>Click to expand</summary> " >> $GITHUB_STEP_SUMMARY
109+
echo " " >> $GITHUB_STEP_SUMMARY
110+
echo "\`\`\` " >> $GITHUB_STEP_SUMMARY
111+
echo " " >> $GITHUB_STEP_SUMMARY
112+
cat $STD_EDITED_OUTPUT >> $GITHUB_STEP_SUMMARY
113+
echo " " >> $GITHUB_STEP_SUMMARY
114+
echo "\`\`\` " >> $GITHUB_STEP_SUMMARY
115+
echo " " >> $GITHUB_STEP_SUMMARY
116+
echo "</details> " >> $GITHUB_STEP_SUMMARY
124117
fi

0 commit comments

Comments
Ā (0)