1
0
mirror of https://github.com/lineageos4microg/docker-lineage-cicd synced 2024-11-09 10:09:56 +01:00

Call merge_target_files to make the flashable `-img.zipz

This commit is contained in:
Pete Fotheringham 2023-08-24 09:40:22 +01:00
parent 7d3cd55926
commit e6a31936fb

@ -359,25 +359,24 @@ for branch in ${BRANCH_NAME//,/ }; do
# Start the build
echo ">> [$(date)] Starting build for $codename, $branch branch" | tee -a "$DEBUG_LOG"
build_successful=false
if (set +eu ; mka "${jobs_arg[@]}" bacon && mka "${jobs_arg[@]}" target-files-package) &>> "$DEBUG_LOG"; then
if (set +eu ; mka "${jobs_arg[@]}" bacon) &>> "$DEBUG_LOG"; then
# Move produced files to the main OUT directory
# make the flashable `-img.zip` file, with all needed `.img` files
echo ">> [$(date)] Making flashable -img.zip file, for $codename" | tee -a "$DEBUG_LOG"
img_zip_name="lineage-$los_ver-$builddate-$RELEASE_TYPE-$codename-img.zip"
merge_target_files --output-img "out/target/product/$img_zip_name" &>> "$DEBUG_LOG"
# Move produced ZIP files to the main OUT directory
echo ">> [$(date)] Moving build artifacts for $codename to '$ZIP_DIR/$zipsubdir'" | tee -a "$DEBUG_LOG"
cd out/target/product/"$codename"
files_to_hash=()
# The main ROM `.zip` file
for build in lineage-*.zip; do
cp -v system/build.prop "$ZIP_DIR/$zipsubdir/$build.prop" &>> "$DEBUG_LOG"
mv "$build" "$ZIP_DIR/$zipsubdir/" &>> "$DEBUG_LOG"
files_to_hash+=( "$build" )
done
# The flashable `-img.zip` file, with all needed `.img` files
img_zip_name="lineage-$los_ver-$builddate-$RELEASE_TYPE-$codename-img.zip"
cp "lineage_$codename-img-eng.$USER.zip" "$ZIP_DIR/$zipsubdir/$img_zip_name" &>> "$DEBUG_LOG"
files_to_hash+=( "$img_zip_name" )
# recovery & boot `.img` files - (no longer needed? to be removed?)
for image in recovery boot; do
if [ -f "$image.img" ]; then