Skip to content

Commit d2d1dd3

Browse files
dalerobertsdaleroberts
committed
More workflows tweaks
1 parent 374a367 commit d2d1dd3

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

‎.github/workflows/test.yml‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -71,26 +71,26 @@ jobs:
7171
if [ -f ctest_output.log ]; then
7272
# Find the line with "tests passed" and get everything from there to the end
7373
SUMMARY_LINE=$(grep -n "tests passed" ctest_output.log | head -1 | cut -d: -f1)
74-
74+
7575
if [ -n "$SUMMARY_LINE" ]; then
7676
# Get the first line (the summary line)
7777
FIRST_LINE=$(tail -n +$SUMMARY_LINE ctest_output.log | head -1)
7878
# Get the multiline summary from the tests passed line onwards
79-
SUMMARY_CONTENT=$(tail -n +$SUMMARY_LINE ctest_output.log | grep -v "Errors while" | tr '\n' '\a')
79+
SUMMARY_CONTENT=$(tail -n +$SUMMARY_LINE ctest_output.log | grep -v "Errors while running" | tr '\n' '\a')
8080
# Replace newlines with %0A for GitHub Actions annotation
8181
SUMMARY_CONTENT=$(echo "$SUMMARY_CONTENT" | tr '\a' '\n' | sed ':a;N;$!ba;s/\n/%0A/g')
82-
82+
8383
# Check if there are failed tests
8484
if grep -q "tests failed" ctest_output.log; then
8585
echo "::error title=Test results (openblas): $FIRST_LINE::$SUMMARY_CONTENT"
8686
else
8787
echo "::notice title=Test results (openblas): $FIRST_LINE::$SUMMARY_CONTENT"
8888
fi
8989
else
90-
echo "::error title=Test Error::Could not find test summary in ctest output"
90+
echo "::warning title=Test Warning::Could not find test summary in ctest output"
9191
fi
9292
else
93-
echo "::error title=Test Error::Could not find ctest output file"
93+
echo "::warning title=Test Warning::Could not find ctest output file"
9494
fi
9595
9696
ctest_linux_dyn_mkl:
@@ -235,26 +235,26 @@ jobs:
235235
if [ -f ctest_output.log ]; then
236236
# Find the line with "tests passed" and get everything from there to the end
237237
SUMMARY_LINE=$(grep -n "tests passed" ctest_output.log | head -1 | cut -d: -f1)
238-
238+
239239
if [ -n "$SUMMARY_LINE" ]; then
240240
# Get the first line (the summary line)
241241
FIRST_LINE=$(tail -n +$SUMMARY_LINE ctest_output.log | head -1)
242242
# Get the multiline summary from the tests passed line onwards
243243
SUMMARY_CONTENT=$(tail -n +$SUMMARY_LINE ctest_output.log | grep -v "Errors while running" | tr '\n' '\a')
244244
# Replace newlines with %0A for GitHub Actions annotation
245245
SUMMARY_CONTENT=$(echo "$SUMMARY_CONTENT" | tr '\a' '\n' | sed ':a;N;$!ba;s/\n/%0A/g')
246-
246+
247247
# Check if there are failed tests
248248
if grep -q "tests failed" ctest_output.log; then
249249
echo "::error title=Test results (mkl): $FIRST_LINE::$SUMMARY_CONTENT"
250250
else
251251
echo "::notice title=Test results (mkl): $FIRST_LINE::$SUMMARY_CONTENT"
252252
fi
253253
else
254-
echo "::error title=Test Error::Could not find test summary in ctest output"
254+
echo "::warning title=Test Warning::Could not find test summary in ctest output"
255255
fi
256256
else
257-
echo "::error title=Test Error::Could not find ctest output file"
257+
echo "::warning title=Test Warning::Could not find ctest output file"
258258
fi
259259
260260
test_linux_mkl_binaries:
@@ -299,8 +299,7 @@ jobs:
299299
if: steps.cache-oneapi.outputs.cache-hit != 'true'
300300
run: |
301301
curl -L $LINUX_BASEKIT_URL -o install.sh
302-
#sudo sh install.sh -a --action install --components intel.oneapi.lin.mkl.devel --eula=accept -s
303-
sudo sh install.sh -a --action install --eula=accept -s
302+
sudo sh install.sh -a --action install --components intel.oneapi.lin.mkl.devel --eula=accept -s
304303
305304
- name: Check branch name
306305
shell: bash
@@ -603,7 +602,7 @@ jobs:
603602
604603
test_windows_mkl_binaries:
605604
name: Test Windows MKL binaries from build workflow
606-
runs-on: windows-latest
605+
runs-on: windows-2025
607606
needs: [] # Don't depend on other test jobs
608607
env:
609608
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
@@ -790,7 +789,7 @@ jobs:
790789
791790
test_windows_openblas_binaries:
792791
name: Test Windows OpenBLAS binaries from build workflow
793-
runs-on: windows-latest
792+
runs-on: windows-2025
794793
needs: [] # Don't depend on other test jobs
795794
env:
796795
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
@@ -1086,29 +1085,29 @@ jobs:
10861085
elif command -v sed &> /dev/null; then
10871086
sed -i.bak 's/\r$//' ctest_output.log 2>/dev/null || true
10881087
fi
1089-
1088+
10901089
# Find the line with "tests passed" and get everything from there to the end
10911090
SUMMARY_LINE=$(grep -n "tests passed" ctest_output.log 2>/dev/null | head -1 | cut -d: -f1)
1092-
1091+
10931092
if [ -n "$SUMMARY_LINE" ]; then
10941093
# Get the first line (the summary line)
10951094
FIRST_LINE=$(tail -n +$SUMMARY_LINE ctest_output.log | head -1)
10961095
# Get the multiline summary from the tests passed line onwards
10971096
SUMMARY_CONTENT=$(tail -n +$SUMMARY_LINE ctest_output.log | grep -v "Errors while running" | head -20)
10981097
# Replace newlines with %0A for GitHub Actions annotation
10991098
SUMMARY_CONTENT=$(echo "$SUMMARY_CONTENT" | sed ':a;N;$!ba;s/\n/%0A/g')
1100-
1099+
11011100
# Check if there are failed tests
11021101
if grep -q "tests failed" ctest_output.log; then
1103-
echo "::error title=Test results (windows mkl)::$FIRST_LINE - $SUMMARY_CONTENT"
1102+
echo "::error title=Test results (windows mkl): $FIRST_LINE::$SUMMARY_CONTENT"
11041103
else
1105-
echo "::notice title=Test results (windows mkl)::$FIRST_LINE - $SUMMARY_CONTENT"
1104+
echo "::notice title=Test results (windows mkl): $FIRST_LINE::$SUMMARY_CONTENT"
11061105
fi
11071106
else
1108-
echo "::warning title=Test Warning::Could not find test summary in ctest output (tests may still be running or output format changed)"
1107+
echo "::warning title=Test Warning::Could not find test summary in ctest output"
11091108
fi
11101109
else
1111-
echo "::warning title=Test Warning::Could not find ctest output file (tests may not have run)"
1110+
echo "::warning title=Test Warning::Could not find ctest output file"
11121111
fi
11131112
exit 0
11141113

0 commit comments

Comments
 (0)