Skip to content

Commit e56716a

Browse files
Merge #1660: ci: Fix exiting from ci.sh on error
d87c3bc ci: Fix exiting from ci.sh on error (Tim Ruffing) Pull request description: Fixes the following bash error when make fails: ./ci/ci.sh: line 100: return: can only `return' from a function or sourced script ACKs for top commit: hebasto: ACK d87c3bc Tree-SHA512: 5ecd0f550f7659cc41b403fdb7d5d3d37d1a167d585cca02b0aca209c8b9592bb3067cf11aeb80775666e7232f31bf05cf1bb97fec8c67f3bc5fe2243ddbbcfa
2 parents 2abb35b + d87c3bc commit e56716a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ci/ci.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ if [ $build_exit_code -ne 0 ]; then
9494
*snapshot*)
9595
# Ignore internal compiler errors in gcc-snapshot and clang-snapshot
9696
grep -e "internal compiler error:" -e "PLEASE submit a bug report" make.log
97-
return $?;
97+
exit $?
9898
;;
9999
*)
100-
return 1;
100+
exit 1
101101
;;
102102
esac
103103
fi

0 commit comments

Comments
 (0)