Merge "scripts: add C3 compile flow. [1/1]" into projects/amlogic-dev
diff --git a/build_all.sh b/build_all.sh
index b235cc1..f0aaba5 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -51,10 +51,11 @@
[ "$?" -ne 0 ] && echo "Failed to make distclean! $LINE" && exit 2
echo -n "$nr. Building $LINE ... "
make >> $BUILD_LOG 2>&1
- [ "$?" -ne 0 ] && echo "failed!" && cat $BUILD_LOG && echo -e "\nAborted with errors!\n" && exit 3
+ [ "$?" -ne 0 ] && echo "failed!" && cat $BUILD_LOG && touch $LAST_BUILD_FAILURE && echo -e "\nAborted with errors!\n" && exit 3
grep -qr "warning: " $BUILD_LOG
- [ "$?" -eq 0 ] && cat $BUILD_LOG && echo -e "\nAborted with warnings!\n" && exit 1
+ [ "$?" -eq 0 ] && cat $BUILD_LOG && touch $LAST_BUILD_FAILURE && echo -e "\nAborted with warnings!\n" && exit 1
echo "OK."
+ rm -f $LAST_BUILD_FAILURE
if [[ "$SUBMIT_TYPE" == "daily" ]]; then
if [[ "$ARCH" == "arm64" ]] && [[ "$PRODUCT" == "speaker" ]]; then
make_image >> $BUILD_LOG 2>&1
diff --git a/gen_jenkins_trigger.sh b/gen_jenkins_trigger.sh
index b99032f..a82d408 100755
--- a/gen_jenkins_trigger.sh
+++ b/gen_jenkins_trigger.sh
@@ -41,7 +41,7 @@
[ -z "$DIFF_MANIFEST" ] && DIFF_MANIFEST="$OUTPUT_DIR/diff_manifest.xml"
-if [ ! -f $LAST_MANIFEST ]; then
+if [ ! -f $LAST_MANIFEST ] || [ -f $LAST_BUILD_FAILURE ]; then
gen_jenkins_trigger
else
comm -3 <(sort $LAST_MANIFEST) <(sort $CURRENT_MANIFEST) > $DIFF_MANIFEST
diff --git a/jenkins_verify.sh b/jenkins_verify.sh
index 72fd625..2f75f5e 100755
--- a/jenkins_verify.sh
+++ b/jenkins_verify.sh
@@ -33,6 +33,7 @@
LAST_MANIFEST="$OUTPUT_DIR/last_manifest.xml"
CURRENT_MANIFEST="$OUTPUT_DIR/curr_manifest.xml"
DIFF_MANIFEST="$OUTPUT_DIR/diff_manifest.xml"
+LAST_BUILD_FAILURE="$OUTPUT_DIR/.last_build_failure"
if [ -n "$EXCLUDE_REPOS" ]; then
echo "Exclude repos:"
@@ -106,7 +107,7 @@
source scripts/cherry_pick.sh
# Generate Jenkins trigger
-[ "$SUBMIT_TYPE" = "release" ] && source gen_jenkins_trigger.sh
+[ "$SUBMIT_TYPE" = "daily" ] && source scripts/gen_jenkins_trigger.sh
if [[ "$MANIFEST_BRANCH" == "$BRANCH_NAME" ]]; then
source scripts/build_all_pkg.sh