Skip to content

Commit b384764

Browse files
committed
Error catch better ci
1 parent 8367545 commit b384764

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -357,28 +357,33 @@ jobs:
357357
sleep 10
358358
echo "Running xeus-cpp in Jupter Lite in Chrome"
359359
python -u scripts/automated-notebook-run-script.py --driver chrome --notebook ${{ matrix.notebook }} --kernel ${{ matrix.kernel }}
360-
echo "Diff Notebooks Chrome"
361-
nbdiff notebooks/${{ matrix.notebook }} $HOME/Downloads/${{ matrix.notebook }} --ignore-id --ignore-metadata
362-
export CHROME_TESTS_RETURN_VALUE=$?
360+
nbdiff notebooks/${{ matrix.notebook }} $HOME/Downloads/${{ matrix.notebook }} --ignore-id --ignore-metadata >> chrome_diff.txt
361+
export CHROME_TESTS_RETURN_VALUE=$( [ -s chrome_diff.txt ] && echo 1 || echo 0 )
363362
echo "Running xeus-cpp in Jupter Lite in Firefox"
364363
python -u scripts/automated-notebook-run-script.py --driver firefox --notebook ${{ matrix.notebook }} --kernel ${{ matrix.kernel }}
365-
echo "Diff Notebooks Firefox"
366-
nbdiff notebooks/${{ matrix.notebook }} $HOME/Downloads/${{ matrix.notebook }} --ignore-id --ignore-metadata
367-
export FIREFOX_TESTS_RETURN_VALUE=$?
364+
nbdiff notebooks/${{ matrix.notebook }} $HOME/Downloads/${{ matrix.notebook }} --ignore-id --ignore-metadata >> firefox_diff.txt
365+
export FIREFOX_TESTS_RETURN_VALUE=$( [ -s firefox_diff.txt ] && echo 1 || echo 0 )
368366
rm $HOME/Downloads/${{ matrix.notebook }}
369367
export SAFARI_TESTS_RETURN_VALUE=0
368+
touch safari_diff.txt
370369
if [[ "${{ matrix.os }}" == "macos"* ]]; then
371370
python -m pip install PyAutoGUI
372371
python scripts/enable-downloads-safari-github-ci.py
373372
python -u scripts/automated-notebook-run-script.py --driver safari --notebook ${{ matrix.notebook }} --kernel ${{ matrix.kernel }}
374373
echo "Running xeus-cpp in Jupter Lite in Safari"
375-
echo "Diff Notebooks Safari"
376-
nbdiff notebooks/${{ matrix.notebook }} $HOME/Downloads/${{ matrix.notebook }} --ignore-id --ignore-metadata
377-
export SAFARI_TESTS_RETURN_VALUE=$?
374+
nbdiff notebooks/${{ matrix.notebook }} $HOME/Downloads/${{ matrix.notebook }} --ignore-id --ignore-metadata >> safari_diff.txt
375+
export SAFARI_TESTS_RETURN_VALUE=$( [ -s safari_diff.txt ] && echo 1 || echo 0 )
378376
rm $HOME/Downloads/${{ matrix.notebook }}
379377
fi
380378
if [[ $SAFARI_TESTS_RETURN_VALUE -ne 0 || $FIREFOX_TESTS_RETURN_VALUE -ne 0 || $CHROME_TESTS_RETURN_VALUE -ne 0 ]]; then
381-
echo "Diff for Safari, Chrome or Firefox returned non zero value (could be more than one)"
379+
if [[ "${{ matrix.os }}" == "macos"* ]]; then
380+
echo "Diff Safari (blank means no diff)"
381+
cat safari_diff.txt
382+
fi
383+
echo "Diff Firefox (blank means no diff)"
384+
cat firefox_diff.txt
385+
echo "Diff Chrome (blank means no diff)"
386+
cat chrome_diff.txt
382387
exit 1
383388
fi
384389
timeout-minutes: 15

0 commit comments

Comments
 (0)