Loading src/build.sh +62 −48 Original line number Diff line number Diff line Loading @@ -40,6 +40,50 @@ extract_images() { fi } clean_up() { # Remove old zips and logs if [ "$DELETE_OLD_ZIPS" -gt "0" ]; then if [ "$ZIP_SUBDIR" = true ]; then /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_ZIPS" -V "$e_ver" -N 1 "$ZIP_DIR/$zipsubdir" else /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_ZIPS" -V "$e_ver" -N 1 -c "${DEVICE}" "$ZIP_DIR" fi fi if [ "$DELETE_OLD_LOGS" -gt "0" ]; then if [ "$LOGS_SUBDIR" = true ]; then /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_LOGS" -V "$e_ver" -N 1 "$LOGS_DIR/$logsubdir" else /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_LOGS" -V "$e_ver" -N 1 -c "${DEVICE}" "$LOGS_DIR" fi fi if [ -f /root/userscripts/post-build.sh ]; then echo ">> [$(date)] Running post-build.sh for ${DEVICE}" /root/userscripts/post-build.sh "${DEVICE}" "$build_successful" fi echo ">> [$(date)] Finishing build for ${DEVICE}" if [ "$CLEAN_AFTER_BUILD" = true ]; then echo ">> [$(date)] Cleaning source dir for device ${DEVICE}" cd "$source_dir" || return 1 mka clean fi } exit_script() { if [ "$DELETE_OLD_LOGS" -gt "0" ]; then find "$LOGS_DIR" -maxdepth 1 -name "repo-*.log" | sort | head -n -"$DELETE_OLD_LOGS" | xargs -r rm fi if [ -f /root/userscripts/end.sh ]; then echo ">> [$(date)] Running end.sh" /root/userscripts/end.sh fi if [ "$build_successful" = false ] || [ "$sync_successful" = false ]; then exit 1 fi } sync_successful=true use_openjdk_from_ubuntu=false Loading Loading @@ -344,7 +388,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then # Generate OTA zip echo ">> [$(date)] Generating OTA zip from target-files-package" if [ "${BUILD_ONLY_SYSTEMIMAGE}" != true ]; then if [ "$SIGN_BUILDS" = true ]; then SIGN_KEY=(-k "user-keys/releasekey") fi Loading @@ -352,6 +395,10 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then "$OUT/$E_VERSION" md5sum $OUT/$E_VERSION >$OUT/$E_VERSION.md5sum sha256sum $OUT/$E_VERSION >$OUT/$E_VERSION.sha256sum if [ ! -f "$OUT/$E_VERSION" ]; then clean_up exit_script fi # Generate fastboot package zip (Doesn't include firmware) Loading @@ -360,6 +407,11 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then echo ">> [$(date)] Generating fastboot zip from target-files-package" img_from_target_files "$OUT/$TARGET_FILES" "$OUT/$FASTBOOT_PACKAGE" if [ ! -f "$OUT/$FASTBOOT_PACKAGE" ]; then clean_up exit_script fi IMAGES=("recovery" "boot" "vendor_boot" "dtbo" "vbmeta" "vbmeta_vendor" "vendor_kernel_boot" "super_empty" "system" "odm" "product" "system_ext" "vendor" "vbmeta_system" "super") for i in "${!IMAGES[@]}"; do Loading Loading @@ -441,7 +493,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then fi rm -rf $OUT/IMG build_success=true else echo ">> [$(date)] Unable to find $TARGET_FILES" Loading Loading @@ -625,46 +676,9 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then echo ">> [$(date)] Failed build for ${DEVICE}" fi # Remove old zips and logs if [ "$DELETE_OLD_ZIPS" -gt "0" ]; then if [ "$ZIP_SUBDIR" = true ]; then /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_ZIPS" -V "$e_ver" -N 1 "$ZIP_DIR/$zipsubdir" else /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_ZIPS" -V "$e_ver" -N 1 -c "${DEVICE}" "$ZIP_DIR" fi fi if [ "$DELETE_OLD_LOGS" -gt "0" ]; then if [ "$LOGS_SUBDIR" = true ]; then /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_LOGS" -V "$e_ver" -N 1 "$LOGS_DIR/$logsubdir" else /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_LOGS" -V "$e_ver" -N 1 -c "${DEVICE}" "$LOGS_DIR" fi fi if [ -f /root/userscripts/post-build.sh ]; then echo ">> [$(date)] Running post-build.sh for ${DEVICE}" /root/userscripts/post-build.sh "${DEVICE}" "$build_successful" fi echo ">> [$(date)] Finishing build for ${DEVICE}" if [ "$CLEAN_AFTER_BUILD" = true ]; then echo ">> [$(date)] Cleaning source dir for device ${DEVICE}" cd "$source_dir" || return 1 mka clean fi clean_up fi fi if [ "$DELETE_OLD_LOGS" -gt "0" ]; then find "$LOGS_DIR" -maxdepth 1 -name "repo-*.log" | sort | head -n -"$DELETE_OLD_LOGS" | xargs -r rm fi if [ -f /root/userscripts/end.sh ]; then echo ">> [$(date)] Running end.sh" /root/userscripts/end.sh fi if [ "$build_successful" = false ] || [ "$sync_successful" = false ]; then exit 1 fi exit_script Loading
src/build.sh +62 −48 Original line number Diff line number Diff line Loading @@ -40,6 +40,50 @@ extract_images() { fi } clean_up() { # Remove old zips and logs if [ "$DELETE_OLD_ZIPS" -gt "0" ]; then if [ "$ZIP_SUBDIR" = true ]; then /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_ZIPS" -V "$e_ver" -N 1 "$ZIP_DIR/$zipsubdir" else /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_ZIPS" -V "$e_ver" -N 1 -c "${DEVICE}" "$ZIP_DIR" fi fi if [ "$DELETE_OLD_LOGS" -gt "0" ]; then if [ "$LOGS_SUBDIR" = true ]; then /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_LOGS" -V "$e_ver" -N 1 "$LOGS_DIR/$logsubdir" else /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_LOGS" -V "$e_ver" -N 1 -c "${DEVICE}" "$LOGS_DIR" fi fi if [ -f /root/userscripts/post-build.sh ]; then echo ">> [$(date)] Running post-build.sh for ${DEVICE}" /root/userscripts/post-build.sh "${DEVICE}" "$build_successful" fi echo ">> [$(date)] Finishing build for ${DEVICE}" if [ "$CLEAN_AFTER_BUILD" = true ]; then echo ">> [$(date)] Cleaning source dir for device ${DEVICE}" cd "$source_dir" || return 1 mka clean fi } exit_script() { if [ "$DELETE_OLD_LOGS" -gt "0" ]; then find "$LOGS_DIR" -maxdepth 1 -name "repo-*.log" | sort | head -n -"$DELETE_OLD_LOGS" | xargs -r rm fi if [ -f /root/userscripts/end.sh ]; then echo ">> [$(date)] Running end.sh" /root/userscripts/end.sh fi if [ "$build_successful" = false ] || [ "$sync_successful" = false ]; then exit 1 fi } sync_successful=true use_openjdk_from_ubuntu=false Loading Loading @@ -344,7 +388,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then # Generate OTA zip echo ">> [$(date)] Generating OTA zip from target-files-package" if [ "${BUILD_ONLY_SYSTEMIMAGE}" != true ]; then if [ "$SIGN_BUILDS" = true ]; then SIGN_KEY=(-k "user-keys/releasekey") fi Loading @@ -352,6 +395,10 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then "$OUT/$E_VERSION" md5sum $OUT/$E_VERSION >$OUT/$E_VERSION.md5sum sha256sum $OUT/$E_VERSION >$OUT/$E_VERSION.sha256sum if [ ! -f "$OUT/$E_VERSION" ]; then clean_up exit_script fi # Generate fastboot package zip (Doesn't include firmware) Loading @@ -360,6 +407,11 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then echo ">> [$(date)] Generating fastboot zip from target-files-package" img_from_target_files "$OUT/$TARGET_FILES" "$OUT/$FASTBOOT_PACKAGE" if [ ! -f "$OUT/$FASTBOOT_PACKAGE" ]; then clean_up exit_script fi IMAGES=("recovery" "boot" "vendor_boot" "dtbo" "vbmeta" "vbmeta_vendor" "vendor_kernel_boot" "super_empty" "system" "odm" "product" "system_ext" "vendor" "vbmeta_system" "super") for i in "${!IMAGES[@]}"; do Loading Loading @@ -441,7 +493,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then fi rm -rf $OUT/IMG build_success=true else echo ">> [$(date)] Unable to find $TARGET_FILES" Loading Loading @@ -625,46 +676,9 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then echo ">> [$(date)] Failed build for ${DEVICE}" fi # Remove old zips and logs if [ "$DELETE_OLD_ZIPS" -gt "0" ]; then if [ "$ZIP_SUBDIR" = true ]; then /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_ZIPS" -V "$e_ver" -N 1 "$ZIP_DIR/$zipsubdir" else /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_ZIPS" -V "$e_ver" -N 1 -c "${DEVICE}" "$ZIP_DIR" fi fi if [ "$DELETE_OLD_LOGS" -gt "0" ]; then if [ "$LOGS_SUBDIR" = true ]; then /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_LOGS" -V "$e_ver" -N 1 "$LOGS_DIR/$logsubdir" else /usr/bin/python /root/clean_up.py -n "$DELETE_OLD_LOGS" -V "$e_ver" -N 1 -c "${DEVICE}" "$LOGS_DIR" fi fi if [ -f /root/userscripts/post-build.sh ]; then echo ">> [$(date)] Running post-build.sh for ${DEVICE}" /root/userscripts/post-build.sh "${DEVICE}" "$build_successful" fi echo ">> [$(date)] Finishing build for ${DEVICE}" if [ "$CLEAN_AFTER_BUILD" = true ]; then echo ">> [$(date)] Cleaning source dir for device ${DEVICE}" cd "$source_dir" || return 1 mka clean fi clean_up fi fi if [ "$DELETE_OLD_LOGS" -gt "0" ]; then find "$LOGS_DIR" -maxdepth 1 -name "repo-*.log" | sort | head -n -"$DELETE_OLD_LOGS" | xargs -r rm fi if [ -f /root/userscripts/end.sh ]; then echo ">> [$(date)] Running end.sh" /root/userscripts/end.sh fi if [ "$build_successful" = false ] || [ "$sync_successful" = false ]; then exit 1 fi exit_script