1 |
commit: b7e493b4e4ad6cf6f9367e4b139df042526c21de |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 15 03:44:41 2017 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 15 03:44:41 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b7e493b4 |
7 |
|
8 |
catalyst-auto: run trigger_post_build after every successful spec, to export results sooner. |
9 |
|
10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
11 |
|
12 |
tools/catalyst-auto | 16 ++++++++++++---- |
13 |
1 file changed, 12 insertions(+), 4 deletions(-) |
14 |
|
15 |
diff --git a/tools/catalyst-auto b/tools/catalyst-auto |
16 |
index 35443c4a..f605873c 100755 |
17 |
--- a/tools/catalyst-auto |
18 |
+++ b/tools/catalyst-auto |
19 |
@@ -115,6 +115,13 @@ catalyst_var() { |
20 |
(. "${CATALYST_CONFIG}"; echo "${!var}") |
21 |
} |
22 |
|
23 |
+trigger_post_build() { |
24 |
+ if ! run_cmd "${TMPDIR}/log/post_build.log" post_build; then |
25 |
+ send_email "Catalyst build error - post_build" "The post_build function failed" "${TMPDIR}/log/post_build.log" |
26 |
+ exit 1 |
27 |
+ fi |
28 |
+} |
29 |
+ |
30 |
# Parse args |
31 |
while [ ${#} -gt 0 ] |
32 |
do |
33 |
@@ -334,6 +341,8 @@ for a in "" ${SETS}; do |
34 |
build_failure=1 |
35 |
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}" |
36 |
continue 2 |
37 |
+ else |
38 |
+ trigger_post_build |
39 |
fi |
40 |
done |
41 |
|
42 |
@@ -344,6 +353,8 @@ for a in "" ${SETS}; do |
43 |
build_failure=1 |
44 |
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}" |
45 |
break |
46 |
+ else |
47 |
+ trigger_post_build |
48 |
fi |
49 |
done |
50 |
|
51 |
@@ -355,10 +366,7 @@ for a in "" ${SETS}; do |
52 |
update_symlinks |
53 |
done |
54 |
|
55 |
-if ! run_cmd "${TMPDIR}/log/post_build.log" post_build; then |
56 |
- send_email "Catalyst build error - post_build" "The post_build function failed" "${TMPDIR}/log/post_build.log" |
57 |
- exit 1 |
58 |
-fi |
59 |
+trigger_post_build |
60 |
|
61 |
if [ ${build_failure} = 0 ]; then |
62 |
if [[ ${lastrun} -ne 0 ]]; then |