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

Merge master and multibranch

This commit is contained in:
Nicola Corna 2018-02-28 21:30:18 +01:00
parent ead08cc100
commit b55109556f
3 changed files with 86 additions and 53 deletions

@ -53,8 +53,11 @@ ENV USER_MAIL 'lineageos-buildbot@docker.host'
# Only some branches are supported # Only some branches are supported
ENV INCLUDE_PROPRIETARY true ENV INCLUDE_PROPRIETARY true
# If you want to start always fresh (re-create all the source code everytime) set this to 'true' # Mount an overlay filesystem over the source dir to do each build on a clean source
ENV CLEAN_SRCDIR false ENV BUILD_OVERLAY false
# Clone the full LineageOS mirror (> 200 GB)
ENV LOCAL_MIRROR false
# If you want to preserve old ZIPs set this to 'false' # If you want to preserve old ZIPs set this to 'false'
ENV CLEAN_OUTDIR false ENV CLEAN_OUTDIR false
@ -64,6 +67,9 @@ ENV CLEAN_OUTDIR false
# For example, '0 10 * * *' means 'Every day at 10:00 UTC' # For example, '0 10 * * *' means 'Every day at 10:00 UTC'
ENV CRONTAB_TIME 'now' ENV CRONTAB_TIME 'now'
# Clean artifacts output after each build
ENV CLEAN_AFTER_BUILD true
# Provide root capabilities builtin inside the ROM (see http://lineageos.org/Update-and-Build-Prep/) # Provide root capabilities builtin inside the ROM (see http://lineageos.org/Update-and-Build-Prep/)
ENV WITH_SU false ENV WITH_SU false

@ -19,6 +19,7 @@
IFS=',' IFS=','
shopt -s dotglob shopt -s dotglob
shopt -s extglob
# cd to working directory # cd to working directory
cd "$SRC_DIR" cd "$SRC_DIR"
@ -31,7 +32,7 @@ fi
# If requested, clean the OUT dir in order to avoid clutter # If requested, clean the OUT dir in order to avoid clutter
if [ "$CLEAN_OUTDIR" = true ]; then if [ "$CLEAN_OUTDIR" = true ]; then
echo ">> [$(date)] Cleaning '$ZIP_DIR'" echo ">> [$(date)] Cleaning '$ZIP_DIR'"
rm "$ZIP_DIR/*" rm "$ZIP_DIR/"*
fi fi
# Treat DEVICE_LIST as DEVICE_LIST_<first_branch> # Treat DEVICE_LIST as DEVICE_LIST_<first_branch>
@ -44,32 +45,38 @@ fi
# If needed, migrate from the old SRC_DIR structure # If needed, migrate from the old SRC_DIR structure
if [ -d "$SRC_DIR/.repo" ]; then if [ -d "$SRC_DIR/.repo" ]; then
echo ">> [$(date)] Removing old repository" branch_dir=$(repo info -o | sed -ne 's/Manifest branch: refs\/heads\///p' | sed 's/[^[:alnum:]]/_/g')
rm -rf "$SRC_DIR/*" branch_dir=${branch_dir^^}
echo ">> [$(date)] WARNING: old source dir detected, moving source from \"\$SRC_DIR\" to \"\$SRC_DIR/$branch_dir\""
if [ -d "$branch_dir" ] && [ -z "$(ls -A "$branch_dir")" ]; then
echo ">> [$(date)] ERROR: $branch_dir already exists and is not empty; aborting"
fi
mkdir -p "$branch_dir"
mv !("$branch_dir") "$branch_dir"
fi fi
mkdir -p "$TMP_DIR/device" if [ "$LOCAL_MIRROR" = true ]; then
mkdir -p "$TMP_DIR/workdir"
mkdir -p "$TMP_DIR/merged"
cd "$MIRROR_DIR" cd "$MIRROR_DIR"
if [ ! -d .repo ]; then if [ ! -d .repo ]; then
echo ">> [$(date)] Initializing mirror repository" echo ">> [$(date)] Initializing mirror repository"
yes | repo init -q -u https://github.com/LineageOS/mirror --mirror --no-clone-bundle -p linux yes | repo init -q -u https://github.com/LineageOS/mirror --mirror --no-clone-bundle -p linux
fi fi
# Copy local manifests to the appropriate folder in order take them into consideration # Copy local manifests to the appropriate folder in order take them into consideration
echo ">> [$(date)] Copying '$LMANIFEST_DIR/*.xml' to '.repo/local_manifests/'" echo ">> [$(date)] Copying '$LMANIFEST_DIR/*.xml' to '.repo/local_manifests/'"
mkdir -p .repo/local_manifests mkdir -p .repo/local_manifests
rsync -a --delete --include '*.xml' --exclude '*' "$LMANIFEST_DIR/" .repo/local_manifests/ rsync -a --delete --include '*.xml' --exclude '*' "$LMANIFEST_DIR/" .repo/local_manifests/
if [ "$INCLUDE_PROPRIETARY" = true ]; then rm -f .repo/local_manifests/proprietary.xml
if [ "$INCLUDE_PROPRIETARY" = true ]; then
wget -q -O .repo/local_manifests/proprietary.xml "https://raw.githubusercontent.com/TheMuppets/manifests/mirror/default.xml" wget -q -O .repo/local_manifests/proprietary.xml "https://raw.githubusercontent.com/TheMuppets/manifests/mirror/default.xml"
fi fi
echo ">> [$(date)] Syncing mirror repository" echo ">> [$(date)] Syncing mirror repository"
repo sync -q --force-sync --no-clone-bundle repo sync -q --force-sync --no-clone-bundle
fi
for branch in $BRANCH_NAME; do for branch in $BRANCH_NAME; do
branch_dir=$(sed 's/[^[:alnum:]]/_/g' <<< $branch) branch_dir=$(sed 's/[^[:alnum:]]/_/g' <<< $branch)
@ -93,9 +100,11 @@ for branch in $BRANCH_NAME; do
fi fi
done done
if [ ! -d .repo ]; then echo ">> [$(date)] (Re)initializing branch repository"
echo ">> [$(date)] Initializing branch repository" if [ "$LOCAL_MIRROR" = true ]; then
yes | repo init -q -u https://github.com/LineageOS/android.git --reference "$MIRROR_DIR" -b "$branch" yes | repo init -q -u https://github.com/LineageOS/android.git --reference "$MIRROR_DIR" -b "$branch"
else
yes | repo init -q -u https://github.com/LineageOS/android.git -b "$branch"
fi fi
# Copy local manifests to the appropriate folder in order take them into consideration # Copy local manifests to the appropriate folder in order take them into consideration
@ -103,6 +112,7 @@ for branch in $BRANCH_NAME; do
mkdir -p .repo/local_manifests mkdir -p .repo/local_manifests
rsync -a --delete --include '*.xml' --exclude '*' "$LMANIFEST_DIR/" .repo/local_manifests/ rsync -a --delete --include '*.xml' --exclude '*' "$LMANIFEST_DIR/" .repo/local_manifests/
rm -f .repo/local_manifests/proprietary.xml
if [ "$INCLUDE_PROPRIETARY" = true ]; then if [ "$INCLUDE_PROPRIETARY" = true ]; then
if [[ $branch =~ .*cm\-13\.0.* ]]; then if [[ $branch =~ .*cm\-13\.0.* ]]; then
themuppets_branch=cm-13.0 themuppets_branch=cm-13.0
@ -114,6 +124,7 @@ for branch in $BRANCH_NAME; do
themuppets_branch=lineage-15.1 themuppets_branch=lineage-15.1
echo ">> [$(date)] Can't find a matching branch on github.com/TheMuppets, using $themuppets_branch" echo ">> [$(date)] Can't find a matching branch on github.com/TheMuppets, using $themuppets_branch"
fi fi
wget -q -O .repo/local_manifests/proprietary.xml "https://raw.githubusercontent.com/TheMuppets/manifests/$themuppets_branch/muppets.xml" wget -q -O .repo/local_manifests/proprietary.xml "https://raw.githubusercontent.com/TheMuppets/manifests/$themuppets_branch/muppets.xml"
fi fi
@ -225,17 +236,27 @@ for branch in $BRANCH_NAME; do
currentdate=$(date +%Y%m%d) currentdate=$(date +%Y%m%d)
if [ "$builddate" != "$currentdate" ]; then if [ "$builddate" != "$currentdate" ]; then
# Sync the source code # Sync the source code
echo ">> [$(date)] Syncing mirror repository"
builddate=$currentdate builddate=$currentdate
if [ "$LOCAL_MIRROR" = true ]; then
echo ">> [$(date)] Syncing mirror repository"
cd "$MIRROR_DIR" cd "$MIRROR_DIR"
repo sync -q --force-sync --no-clone-bundle repo sync -q --force-sync --no-clone-bundle
fi
echo ">> [$(date)] Syncing branch repository" echo ">> [$(date)] Syncing branch repository"
cd "$SRC_DIR/$branch_dir" cd "$SRC_DIR/$branch_dir"
repo sync -q -c --force-sync repo sync -q -c --force-sync
fi fi
if [ "$BUILD_OVERLAY" = true ]; then
mkdir -p "$TMP_DIR/device" "$TMP_DIR/workdir" "$TMP_DIR/merged"
mount -t overlay overlay -o lowerdir="$SRC_DIR/$branch_dir",upperdir="$TMP_DIR/device",workdir="$TMP_DIR/workdir" "$TMP_DIR/merged" mount -t overlay overlay -o lowerdir="$SRC_DIR/$branch_dir",upperdir="$TMP_DIR/device",workdir="$TMP_DIR/workdir" "$TMP_DIR/merged"
cd "$TMP_DIR/merged" source_dir="$TMP_DIR/merged"
else
source_dir="$SRC_DIR/$branch_dir"
fi
cd "$source_dir"
if [ "$ZIP_SUBDIR" = true ]; then if [ "$ZIP_SUBDIR" = true ]; then
zipsubdir=$codename zipsubdir=$codename
@ -279,12 +300,12 @@ for branch in $BRANCH_NAME; do
if [ "$DELETE_OLD_DELTAS" -gt "0" ]; then if [ "$DELETE_OLD_DELTAS" -gt "0" ]; then
/usr/bin/python /root/clean_up.py -n $DELETE_OLD_DELTAS -V $los_ver -N 1 "$DELTA_DIR" >> $DEBUG_LOG 2>&1 /usr/bin/python /root/clean_up.py -n $DELETE_OLD_DELTAS -V $los_ver -N 1 "$DELTA_DIR" >> $DEBUG_LOG 2>&1
fi fi
cd "$TMP_DIR/merged" cd "$source_dir"
else else
# If the first build, copy the current full zip in $SRC_DIR/merged/delta_last/$codename/ # If the first build, copy the current full zip in $source_dir/delta_last/$codename/
echo ">> [$(date)] No previous build for $codename; using current build as base for the next delta" | tee -a "$DEBUG_LOG" echo ">> [$(date)] No previous build for $codename; using current build as base for the next delta" | tee -a "$DEBUG_LOG"
mkdir -p delta_last/$codename/ >> "$DEBUG_LOG" 2>&1 mkdir -p delta_last/$codename/ >> "$DEBUG_LOG" 2>&1
find out/target/product/$codename -name 'lineage-*.zip' -type f -maxdepth 1 -exec cp {} "$SRC_DIR/merged/delta_last/$codename/" \; >> "$DEBUG_LOG" 2>&1 find out/target/product/$codename -name 'lineage-*.zip' -type f -maxdepth 1 -exec cp {} "$source_dir/delta_last/$codename/" \; >> "$DEBUG_LOG" 2>&1
fi fi
fi fi
# Move produced ZIP files to the main OUT directory # Move produced ZIP files to the main OUT directory
@ -294,7 +315,7 @@ for branch in $BRANCH_NAME; do
sha256sum "$build" > "$ZIP_DIR/$zipsubdir/$build.sha256sum" sha256sum "$build" > "$ZIP_DIR/$zipsubdir/$build.sha256sum"
done done
find . -name 'lineage-*.zip*' -type f -maxdepth 1 -exec mv {} "$ZIP_DIR/$zipsubdir/" \; >> "$DEBUG_LOG" 2>&1 find . -name 'lineage-*.zip*' -type f -maxdepth 1 -exec mv {} "$ZIP_DIR/$zipsubdir/" \; >> "$DEBUG_LOG" 2>&1
cd "$TMP_DIR/merged" cd "$source_dir"
build_successful=true build_successful=true
else else
echo ">> [$(date)] Failed build for $codename" | tee -a "$DEBUG_LOG" echo ">> [$(date)] Failed build for $codename" | tee -a "$DEBUG_LOG"
@ -313,6 +334,7 @@ for branch in $BRANCH_NAME; do
fi fi
echo ">> [$(date)] Finishing build for $codename" | tee -a "$DEBUG_LOG" echo ">> [$(date)] Finishing build for $codename" | tee -a "$DEBUG_LOG"
if [ "$BUILD_OVERLAY" = true ]; then
# The Jack server must be stopped manually, as we want to unmount $TMP_DIR/merged # The Jack server must be stopped manually, as we want to unmount $TMP_DIR/merged
cd "$TMP_DIR" cd "$TMP_DIR"
if [ -f "$TMP_DIR/merged/prebuilts/sdk/tools/jack-admin" ]; then if [ -f "$TMP_DIR/merged/prebuilts/sdk/tools/jack-admin" ]; then
@ -325,17 +347,22 @@ for branch in $BRANCH_NAME; do
done done
umount "$TMP_DIR/merged" umount "$TMP_DIR/merged"
echo ">> [$(date)] Cleaning source dir for device $codename" fi
rm -rf device/*
if [ "$CLEAN_AFTER_BUILD" = true ]; then
echo ">> [$(date)] Cleaning source dir for device $codename" | tee -a "$DEBUG_LOG"
if [ "$BUILD_OVERLAY" = true ]; then
cd "$TMP_DIR"
rm -rf "$TMP_DIR/"*
else
cd "$source_dir"
mka clean >> "$DEBUG_LOG" 2>&1
fi
fi
fi fi
done done
# Clean the branch source directory if requested
if [ "$CLEAN_SRCDIR" = true ]; then
rm -rf "$SRC_DIR/$branch_dir"
fi
fi fi
done done

@ -2,7 +2,7 @@
# Docker init script # Docker init script
# Copyright (c) 2017 Julian Xhokaxhiu # Copyright (c) 2017 Julian Xhokaxhiu
# Copyright (C) 2017 Nicola Corna <nicola@corna.info> # Copyright (C) 2017-2018 Nicola Corna <nicola@corna.info>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by